Merge tag 'upstream/1.2.5'
authorSven Hoexter <sven@timegate.de>
Wed, 7 Dec 2016 16:55:33 +0000 (17:55 +0100)
committerSven Hoexter <sven@timegate.de>
Wed, 7 Dec 2016 16:55:33 +0000 (17:55 +0100)
commite97372aff775bf45e9cb7f8f3070fba699cf6a8a
tree14b08f4e784d79afd468a979f9b90359b5c584ca
parent84f967ffea2ef60ecadc6d243e10f5ff4e92a922
parent0e295d91bb7f18afee1a0b0d587e5a0cf58bf2fb
Merge tag 'upstream/1.2.5'

Upstream version 1.2.5