Ingo Schommer c09bca6fac Merge remote-tracking branch 'origin/3.1'
Conflicts:
	lang/ja_JP.yml
	lang/lt.yml
	lang/pl.yml
2013-02-18 14:18:27 +01:00
..
2013-01-21 16:53:19 +13:00
2013-02-04 12:12:28 +01:00