Merge tag 'upstream/0.6.0'
authorgregor herrmann <gregoa@debian.org>
Wed, 12 Jun 2013 21:06:21 +0000 (23:06 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 12 Jun 2013 21:06:21 +0000 (23:06 +0200)
commita4dcec2560458c2ef150644537e41f6091f7c6db
tree3909234c076fa10b75c8314fd166daabd95dd7a0
parentd594e6405eec1749072e3172c9747769a26f8fa3
parente88a329c1b07c932ad34b685a25d3a1914a79ffb
Merge tag 'upstream/0.6.0'

Upstream version 0.6.0