Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 28 Dec 2012 06:20:28 +0000 (07:20 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 28 Dec 2012 06:20:28 +0000 (07:20 +0100)

Trivial merge