Add Gemfile with debian squeeze versions
Require rubygems for daemons scripts
Silence deprecation warnings
Require rails 2.3.15 when debian rails is not installed
Remove zombie submodule
Add escambo theme
Merge branch 'ai2661' of git://gitorious.org/~brauliobo/noosfero/brauliobos-noosfero into escambo
Merge branch 'master' of git://gitorious.org/noosfero/noosfero into escambo
Use sass
Merge branch 'master' of git://gitorious.org/noosfero/noosfero into easysafeinstall

Conflicts:
	Gemfile
	Gemfile.lock
Revert "Require rails 2.3.15 when debian rails is not installed"

This reverts commit 184ad72a80ea02de591472d60b325f99f27536ee.
Merge branch 'easysafeinstall' of git://github.com/coletivoEITA/noosfero-ecosol into escambo
Add exchange and evaluation plugins
Update theme
Add cms_learning plugin
[extra] Select active organization
Update theme
Commit to check problems
Create proposal view, the first stage of an exchan
Merge branch 'master' of github.com:ESCAMBO/noosfero-ecosol