Merge branch 'master' of ygdrassil:/mnt/data/git/russian
authorMart Lubbers <mart@martlubbers.net>
Sun, 18 Jan 2015 19:25:00 +0000 (20:25 +0100)
committerMart Lubbers <mart@martlubbers.net>
Sun, 18 Jan 2015 19:25:00 +0000 (20:25 +0100)

Trivial merge