Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Dec 2011 05:49:12 +0000 (06:49 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Dec 2011 05:49:12 +0000 (06:49 +0100)

Trivial merge