Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Mon, 17 Feb 2014 12:16:02 +0000 (13:16 +0100)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Mon, 17 Feb 2014 12:16:02 +0000 (13:16 +0100)

Trivial merge