Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 5 Sep 2011 14:52:50 +0000 (16:52 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 5 Sep 2011 14:52:50 +0000 (16:52 +0200)

Trivial merge