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
..
before_script	Merge remote-tracking branch 'origin/3.1'	2013-02-18 14:18:27 +01:00