Merge branch 'maint'
commit2e14421acbd56348a1e24b3f0804ed6e87110e9e
authorAchim Gratz <Stromeko@Stromeko.DE>
Thu, 20 Sep 2012 18:56:15 +0000 (20 20:56 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Thu, 20 Sep 2012 18:56:15 +0000 (20 20:56 +0200)
tree7bcaf549e784897d57fdb82a320424973722980a
parentbaed7dc7db5bd3019c44eace89027e119dd9e6b5
parentac9ed2a95db0e73ffadc85006616ca3de281c12b
Merge branch 'maint'