Miguel Freitas a77e3db435 Merge branch 'pr/124'
Conflicts:
	js/interface_localization.js
2014-03-26 09:03:06 -03:00
..
2014-03-25 16:46:32 -03:00