Merge tag 'upstream/2.2'
authorgregor herrmann <gregoa@debian.org>
Sun, 25 May 2014 18:10:08 +0000 (20:10 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 25 May 2014 18:10:08 +0000 (20:10 +0200)
commit0f520cc2d7b9a42e5b524ca573322c12eda52026
treef20aaf3c512a9d923979719b22f046ea3f6ccc9e
parent020e77d763db6c133e661ec8614825d74b96eb5c
parentcabe541de87f616949d25c6c452778b0678010af
Merge tag 'upstream/2.2'

Upstream version 2.2