Merge branch 'master' of ssh://kgb.ad.local.domain/var/cache/git/public/solitudo.net
authorTuomas Jormola <tj@solitudo.net>
Tue, 6 Oct 2015 19:54:40 +0000 (22:54 +0300)
committerTuomas Jormola <tj@solitudo.net>
Tue, 6 Oct 2015 19:54:40 +0000 (22:54 +0300)

Trivial merge