Merge branch 'master' of ygdrassil:/mnt/data/git/russian
authorMart Lubbers <mart@martlubbers.net>
Thu, 27 Nov 2014 20:47:11 +0000 (21:47 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 27 Nov 2014 20:47:11 +0000 (21:47 +0100)

Trivial merge