Merge tag 'upstream/1.2.3'
authorSven Hoexter <sven@timegate.de>
Tue, 22 Dec 2015 13:15:15 +0000 (14:15 +0100)
committerSven Hoexter <sven@timegate.de>
Tue, 22 Dec 2015 13:15:15 +0000 (14:15 +0100)
commit0851763ab394b718156526df2ebc1412e5b0f8b0
tree8dd4a0895fbb85fdff64af98a9d9c71ba42e4489
parent810eb4a4bec4c6b914fb3c6c07911ad902bbfd5f
parentfc55662109c1fccea581594f8d6af49da79f456b
Merge tag 'upstream/1.2.3'

Upstream version 1.2.3