Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 02:16:39 +0000 (21:16 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 02:16:39 +0000 (21:16 -0500)
commit230e1bd7706b823bf0e57877ec22d17e4903b1a2
tree1c8bd2637dee656ad53cac13c9a04b4e2cd6c26d
parent68b86d7ce9c9b667bfbcdd60e57ab72e313b1c27
parent9c0fe63fadc848b5154c7c1d4b2ff72dd05bc1c6
Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'

Conflicts:
mediagoblin/db/models.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/db/models.py
mediagoblin/templates/mediagoblin/user_pages/media.html