Merge branch 'maint'
commit86fab4ce354c3fc29a9a169add80a91a98a4c7e6
authorAchim Gratz <Stromeko@Stromeko.DE>
Tue, 14 May 2013 06:40:20 +0000 (14 08:40 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Tue, 14 May 2013 06:40:20 +0000 (14 08:40 +0200)
treecad9c386e063939edb748b15a22104943749b3d7
parent646f1ac426f6b5322dff82987221675b05222e1a
parentbc1e3e18c9975f2befd3abc8bf43b2ad7381189c
Merge branch 'maint'