Merge branch 'maint'
commitbb1c99a4708c749904f211468ffd62a63150b1b4
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 12:03:20 +0000 (26 14:03 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 18:45:03 +0000 (26 20:45 +0200)
tree60de9531659bdbf3f5f13eddfdb1b2390985a748
parenta161c0ebe5c456ffdfcfe9193e00544cddb1b17b
parentfb2af507f008ad868c1825f18f3061b587747056
Merge branch 'maint'