Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Wed, 1 May 2013 13:40:20 +0000 (15:40 +0200)
committerWeblate <42@minetest.ru>
Wed, 1 May 2013 13:40:20 +0000 (15:40 +0200)
commit647f1cbfe58c826b21155d6240266c7da130c548
treefd6de7321b22ddcfa67d2d15b71959fea287cedb
parent97cddd1b960e3b60ce74ff9ad16307b39676144e
parent2b0d1710a5a9eeb6623dca6d41507e0fdb03e50b
Merge remote-tracking branch 'origin/master'