Roberto Rosario 623fa8276f Merge branch 'hotfix/v0.10-hf1' into development ...

Conflicts:
	apps/main/__init__.py
	docs/changelog.rst

2011-12-05 14:46:17 -04:00

..

development.txt

Merge branch 'hotfix/v0.10-hf1' into development

2011-12-05 14:46:17 -04:00

production.txt

Merge branch 'hotfix/v0.10-hf1' into development

2011-12-05 14:46:17 -04:00