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)
commit3498d07ef9d54b5e3a25329055ca9530274fb200
treea1ae03fd499dcea2914cbe42ceee94c5b29fa3f5
parent10d7492f4a1d7a0c779d76ff67d7a9bc1e301fc3
parenta2a29221e52b54fec5e64d12e733cef86df12d02
Merge branch 'master' of ssh://luonnotar/var/git/misc/hallinta-vmail