Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 1 Oct 2011 03:07:44 +0000 (05:07 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 1 Oct 2011 03:07:44 +0000 (05:07 +0200)

Trivial merge