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)
commit376302640d1ce25619242a6bae5a96488f8f0bcc
tree635b6e77c6f9d87048df8ee2fd706f868927e2b7
parent570b9132b7f7b75f7add9d03e019fd689ab53f21
parente05a6f05e7fce66ac7560e066d995c456073d29f
Merge tag 'upstream/24.1'

Upstream version 24.1