Merge branch 'master' of git.dolda2000.com:/srv/git/r/utils
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 19 Dec 2014 22:19:25 +0000 (23:19 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 19 Dec 2014 22:19:25 +0000 (23:19 +0100)

Trivial merge