Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 27 Dec 2012 17:42:17 +0000 (18:42 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 27 Dec 2012 17:42:17 +0000 (18:42 +0100)

Trivial merge