Merge branch 'maint'
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 16:23:03 +0000 (8 18:23 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 16:23:03 +0000 (8 18:23 +0200)

Trivial merge