Merge remote branch 'origin/master'
authorWeblate <42@minetest.ru>
Sat, 30 Mar 2013 18:49:52 +0000 (19:49 +0100)
committerWeblate <42@minetest.ru>
Sat, 30 Mar 2013 18:49:52 +0000 (19:49 +0100)
commita0566270d9fa075afa36a7e3e68c690b1b23ba90
tree6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1
parent0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4
parent1aa50b13622c1e264044839ecdf0152670dae6ce
Merge remote branch 'origin/master'