Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:56:44 +0000 (02:56 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:56:44 +0000 (02:56 +0100)

Trivial merge