Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 25 Apr 2014 15:33:22 +0000 (17:33 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 25 Apr 2014 15:33:22 +0000 (17:33 +0200)

Trivial merge