Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Tue, 7 Apr 2015 21:25:13 +0000 (23:25 +0200)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Tue, 7 Apr 2015 21:25:13 +0000 (23:25 +0200)

Trivial merge