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)
commitb4e2971254c5eaaa4bdecd42c3329205cdde166c
tree91974df06b93eed3b3063094b19cada807a9981d
parent2d22f5150a4ad5ae5f213cfaa84a581f94739cad
parent108c94c4f51fd517dc6b96a1bac7474e94875fff
Merge branch 'master' of ygdrassil:/mnt/data/git/russian