Merge tag 'upstream/1.2.4'
authorSven Hoexter <sven@timegate.de>
Sat, 25 Jun 2016 12:12:44 +0000 (14:12 +0200)
committerSven Hoexter <sven@timegate.de>
Sat, 25 Jun 2016 12:12:44 +0000 (14:12 +0200)
commitd99d52ff73deacfe427403765682015d5825799b
treeb398e43ba5eb7206fdb2573a9493d1336412d183
parent21e61762ea040d97bb446195456901b6d5cbba3c
parent62ddc92d38808bea3aba8fe70e3a417197e9d42f
Merge tag 'upstream/1.2.4'

Upstream version 1.2.4