Miguel Freitas 298ed8ffff Merge branch 'pr/115'
Conflicts:
	js/interface_localization.js
2014-03-21 15:48:37 -03:00
..
2014-03-17 00:03:12 -03:00