Roberto Rosario f8e2341f4f Merge branch 'hotfix/v0.11.2' into development ...

Conflicts:
	apps/documents/statistics.py
	docs/changelog.rst

2012-02-02 05:23:17 -04:00

..

development.txt

Only list development tools in the development requirements file

2012-01-25 02:58:01 -04:00

production.txt

Merge branch 'hotfix/v0.11.2' into development

2012-02-02 05:23:17 -04:00