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)
commit964bb8f4a804c31558fc34edc39c66e3a0382398
tree8141e4f11cab69bf1ee96ffca2271c1c86963189
parentda12725dfaaefb2e83966aa615f0694be8cac8ba
parenta4860c9e6c99fd4321c9961740848e0e14300dc8
Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin