Roberto Rosario 0439e0edf7 Merge branch 'development' into feature/ACL_support ...

Conflicts:
	requirements/development.txt
	requirements/production.txt
	urls.py

2011-12-05 16:01:21 -04:00

..

development.txt

Merge branch 'development' into feature/ACL_support

2011-12-05 16:01:21 -04:00

production.txt

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

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