Christopher Allan Webber 0692c01e4c Merge remote branch 'remotes/jwandborg/issue_363' ...

Conflicts:
	setup.py

2011-06-19 20:00:35 -05:00

..

__init__.py

Implement simple media detail page

2011-05-10 16:01:43 -05:00

routing.py

adds routing.py and view.py changes

2011-06-16 12:59:48 -05:00

views.py

Merge remote branch 'remotes/jwandborg/issue_363'

2011-06-19 20:00:35 -05:00