Merge tag 'upstream/3.001.011'
authorgregor herrmann <gregoa@debian.org>
Tue, 12 Aug 2014 19:11:12 +0000 (21:11 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 12 Aug 2014 19:11:12 +0000 (21:11 +0200)
commit9a2c4df9960aa6038bf0c6616678b98ae3df2aea
treecdd77ca0525260237a1e43ad40ca12cbee1b2286
parentcce744fede823188d1775d5431584c721eb7e5dd
parent13f26f94c54e703c3102ed21f4dfa92b1212e5a1
Merge tag 'upstream/3.001.011'

Upstream version 3.001.011