Merge tag 'upstream/2.0'
authorgregor herrmann <gregoa@debian.org>
Mon, 13 Jan 2014 17:46:16 +0000 (18:46 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 13 Jan 2014 17:46:16 +0000 (18:46 +0100)
commit65aaf52332c61a8f279cc2ee512af3b115a690b1
tree4efb38b69e31ab9099fef31ca52099a8dbe8d41b
parent5e4908a717ee60fc9fb321f6c7eb23389d031fe1
parent9ec0417cfa4163b138ff968b4b8a8fb51663b845
Merge tag 'upstream/2.0'

Upstream version 2.0