Merge branch 'maint'
commit4357cd0fcdc32895ed15813f8a72fcce3476f2e7
authorAchim Gratz <Stromeko@Stromeko.DE>
Sat, 15 Sep 2012 18:07:12 +0000 (15 20:07 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sat, 15 Sep 2012 18:07:12 +0000 (15 20:07 +0200)
treece7e2dfac209db33edf3b93659e4e9f982bf1a9f
parent5a122cf7aa0e356f5b1605145ece2eaa3ee7706d
parentf1f1fc8d48171659be7130453596ae7567ab874d
Merge branch 'maint'