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)
commit858e662f521c505898e437c54615c56faae32aee
tree0e896bcf29376e586b14f675043b7a610b0bfd52
parent1facd0220e9c5fdc07e7dea2d8aa7707ce4b7887
parent92054668050d1effd1379294a8d0c999c132f354
Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin