Merge branch 'maint'
commit2f8067c9152d2c41320760728c89d799bc51c598
authorAchim Gratz <Stromeko@Stromeko.DE>
Wed, 10 Sep 2014 08:51:02 +0000 (10 10:51 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Wed, 10 Sep 2014 08:51:02 +0000 (10 10:51 +0200)
tree0518ccfba3d2d2276ffda099d305cd5a195a3907
parentb5c9de618e9a89b339505c6b8643b7e7bf46f9d7
parentd4a7ba2a966a1a5539318a5512f273cf91a4af4c
Merge branch 'maint'