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)
commitbe7e5bbd1d2b4b88ed426a1e6f5f52a92796cb57
treefa0e8f768f23ec9b6ed824a79f5bd918060a0707
parent37e35334c91a5b0cf1a49a736143058174f12cf9
parentacbd51fe9adbd1b803f7a03708fe5a10a510449d
Merge branch 'master' of ygdrassil:/mnt/data/git/russian