Samuel Georges d283d6b143 Merge remote-tracking branch 'remotes/krisawzm/develop' into develop
Conflicts:
	modules/backend/models/BackendPreferences.php
	modules/system/lang/ru/lang.php
	modules/system/lang/sv/lang.php
2015-04-11 10:48:59 +10:00
..
2015-03-24 12:42:35 +08:00