nothing
Merge branch 'master' of github.com:ESCAMBO/noosfero-ecosol

Conflicts:
	plugins/currency/lib/ext/enterprise.rb
Inerted ecahgen symbol in console