Merge branch 'maint'
commit4fb4494e18189cac6fff773d9929a874a2b28ae1
authorAchim Gratz <Stromeko@Stromeko.DE>
Thu, 27 Sep 2012 18:36:50 +0000 (27 20:36 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Thu, 27 Sep 2012 18:36:50 +0000 (27 20:36 +0200)
treebe53896217f207ea70a884417c6d69d7eae21c7f
parentee19704a71819add21a8997082dd6667c40b8547
parent418ec0f5e7be3cda66b05c63d60c6633a244c587
Merge branch 'maint'