Merge tag 'upstream/1.2.2'
authorSven Hoexter <sven@timegate.de>
Sun, 6 Dec 2015 13:38:24 +0000 (14:38 +0100)
committerSven Hoexter <sven@timegate.de>
Sun, 6 Dec 2015 13:38:24 +0000 (14:38 +0100)
commit0bc23c177c8ab35b8fdf4da503b9fa285400b0e6
treecd2fe1b400747de8cc412e502dd0f8838233c08b
parent500e17a31f9edc049fee937dba68f8a3b9e14784
parent3c254c99c6ecd8950b5180975941b875622c3ef1
Merge tag 'upstream/1.2.2'

Upstream version 1.2.2