Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 26 Jun 2011 05:17:47 +0000 (07:17 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 26 Jun 2011 05:17:47 +0000 (07:17 +0200)

Trivial merge