Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 23 Jan 2012 07:02:21 +0000 (08:02 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 23 Jan 2012 07:02:21 +0000 (08:02 +0100)

Trivial merge