Merge branch 'maint'
commit4ca67b8164a3b0a0795f17c589a6ff04f46bda9d
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 07:28:08 +0000 (26 09:28 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 07:28:08 +0000 (26 09:28 +0200)
treedf5296cef194eaed262d2cc0b0f286aa72eb2094
parentab075316b07d1f321b56092459b7fba45a21fb5d
parentf8cc3189f5ec9a3cb79d7302bd8d396bd6ce34ac
Merge branch 'maint'