Merge branch 'maint'
commitf18b153d7c87e9c2dcd6e2c98871b76507d664cd
authorAchim Gratz <Stromeko@Stromeko.DE>
Tue, 7 Jan 2014 20:24:35 +0000 (7 21:24 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Tue, 7 Jan 2014 20:24:35 +0000 (7 21:24 +0100)
tree67618eb433be0fbd54fd97b5859cb2fbb4198ba3
parent677b228104e19e5d6b4dc2a7596c336b0efa4b9c
parent6dc83e651d4d8e77a9b8cf146d725fab8517315c
Merge branch 'maint'