Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 14 Oct 2014 22:05:58 +0000 (00:05 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 14 Oct 2014 22:05:58 +0000 (00:05 +0200)

Trivial merge