Merge branch 'master' of ssh://luonnotar/var/git/misc/hallinta-vmail
authorJoey Schulze <joey@infodrom.org>
Fri, 26 Apr 2013 22:46:25 +0000 (00:46 +0200)
committerJoey Schulze <joey@infodrom.org>
Fri, 26 Apr 2013 22:46:25 +0000 (00:46 +0200)

Trivial merge