Merge branch 'maint'
commit82e1c4b3ec5db48ddf0d7f3e2711de65f95a26b5
authorAchim Gratz <Stromeko@Stromeko.DE>
Mon, 27 Aug 2012 17:37:00 +0000 (27 19:37 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Mon, 27 Aug 2012 17:37:00 +0000 (27 19:37 +0200)
tree118b1179ca98b2692524f85e46a0a6bf0f9fa7bf
parente1b10466855358a35d71273e4c67591180601a5d
parente20cb6f92bb72de7c5405ebeb6dcb9bdad05c8ed
Merge branch 'maint'