Merge tag 'upstream/0.6.1'
authorgregor herrmann <gregoa@debian.org>
Thu, 11 Sep 2014 20:00:39 +0000 (22:00 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 11 Sep 2014 20:00:39 +0000 (22:00 +0200)
commit1dcad17828c6f18d4227dade193fdefb92d6f2e5
tree64289223b125bc876ae498458cae33ff54e2d96f
parent2d20940e9ceff3abce47edd63cf18a6300d4d65e
parenta4898876a6deed0e5e64629ffdd5a0c75c809449
Merge tag 'upstream/0.6.1'

Upstream version 0.6.1