Merge tag 'upstream/24.1'
authorJoachim Wiedorn <ad_debian@joonet.de>
Fri, 17 Oct 2014 00:09:37 +0000 (02:09 +0200)
committerJoachim Wiedorn <ad_debian@joonet.de>
Fri, 17 Oct 2014 00:09:37 +0000 (02:09 +0200)
Upstream version 24.1


Trivial merge