]> git.tue.mpg.de Git - paraslash.git/commitdiff
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:04:40 +0000 (10:04 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:04:40 +0000 (10:04 +0200)

Trivial merge