Samuel Georges 5da198ccd8 Merge remote-tracking branch 'remotes/tresbach/develop' into develop
Conflicts:
	modules/system/lang/pt-br/lang.php
	modules/system/lang/pt-br/validation.php
2015-04-11 10:53:37 +10:00
..