Fix timezone on AR
Check if cart is present
Make adjusts on volunteers scss
Merge branch 'distribution-rails3' of https://github.com/rede-gcr/noosfero into distribution-rails3
Move distribution locales to plugin

Conflicts:
	config/locales/en.yml
	config/locales/pt.yml
Merge branch 'distribution-rails3' of git://github.com/rede-gcr/noosfero into distribution
Move to specific names
Fix crash on production
Fix bar size
Hide results info from other pages
Merge branch 'asset-pipeline' into distribution

Conflicts:
	Gemfile
	config/application.rb
	config/environments/production.rb
	po/pt/noosfero.po
	public/javascripts/application.js
	public/stylesheets/application.css
	script/noosfero-plugins
Use import for correct load_path discovery
Merge branch 'distribution-rails3' of https://github.com/rede-gcr/noosfero into distribution
Fix missing merge conflict
Merge branch 'distribution' into cirandas-rails3

Conflicts:
	Gemfile
	config/application.rb
	plugins/suppliers/locales/en-US.yml
	plugins/suppliers/locales/pt-BR.yml
	po/pt/noosfero.po
	public/javascripts/application.js
	public/stylesheets/application.css