Merge branch 'master' of ssh://kgb.luola.local.domain/var/cache/git/public/solitudo.net
authorTuomas Jormola <tj@solitudo.net>
Thu, 14 Jul 2011 09:17:15 +0000 (12:17 +0300)
committerTuomas Jormola <tj@solitudo.net>
Thu, 14 Jul 2011 09:17:15 +0000 (12:17 +0300)

Trivial merge