Merge tag 'upstream/24.2'
authorJoachim Wiedorn <joodebian@joonet.de>
Sun, 22 Nov 2015 00:41:18 +0000 (01:41 +0100)
committerJoachim Wiedorn <joodebian@joonet.de>
Sun, 22 Nov 2015 00:41:18 +0000 (01:41 +0100)
commit0fbc23b104256965cbb3678e85a0ae55a5149c58
treecb50d56ffcf490821c2395d07f2bb484aa73d9b6
parentc2b30d7a0a3df3742bbb1996fe016f7e3053f248
parent6474a619fc4572914f921cbff9d72784c1792966
Merge tag 'upstream/24.2'

Upstream version 24.2