Merge branch 'master' of git.dolda2000.com:/srv/git/r/utils
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 30 Nov 2013 15:35:12 +0000 (16:35 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 30 Nov 2013 15:35:12 +0000 (16:35 +0100)

Trivial merge