Roberto Rosario 4abb3c5ebc Merge branch 'new_metadata' ...

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

2011-05-21 00:13:38 -04:00

..

development.txt

Merge branch 'new_metadata'

2011-05-21 00:13:38 -04:00

production.txt

Merge branch 'new_metadata'

2011-05-21 00:13:38 -04:00