Merge branch 'maint'
commitc87ca996ce61dd3f632b4ae7fd092099943f2879
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 08:33:13 +0000 (26 10:33 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 26 Aug 2012 08:33:13 +0000 (26 10:33 +0200)
tree43dca1e34ac78e1cd8d8231ef28dd98019765fa5
parentdc116516befb7570160ce61921dfbb185d1de392
parentee9e27e66eb8abe0822ba1e10859f02a3c5675da
Merge branch 'maint'