Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Wed, 1 May 2013 13:33:15 +0000 (15:33 +0200)
committerWeblate <42@minetest.ru>
Wed, 1 May 2013 13:33:15 +0000 (15:33 +0200)
commit97cddd1b960e3b60ce74ff9ad16307b39676144e
tree0547ab284acc0fdf8aad2a36643be6f78f786ef1
parentf1f2004cb9efb026625b192b404064c26ceb6d5f
parent898a4e441fc0245aaf4821ff5e3dad0daccda3b5
Merge remote-tracking branch 'origin/master'