Merge branch 'maint'
commitaaee171921e71933e85d1f724db0882acf322b08
authorAchim Gratz <Stromeko@Stromeko.DE>
Tue, 3 Feb 2015 08:23:58 +0000 (3 09:23 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Tue, 3 Feb 2015 08:23:58 +0000 (3 09:23 +0100)
tree65a621aa25663e178668b2794b7465b9003795e7
parent1d4c79d41525113f9e43b82dc9b24d353dc311bd
parent5542a4fd95dd96939ad237a3695a511c8a735e4c
Merge branch 'maint'