Merge branch 'master' of ssh://gitcentre/srv/git/test master
authorMegaBrutal <megabrutal@jedi.lan>
Mon, 15 Dec 2014 13:35:49 +0000 (14:35 +0100)
committerMegaBrutal <megabrutal@jedi.lan>
Mon, 15 Dec 2014 13:35:49 +0000 (14:35 +0100)

Trivial merge