Merge remote branch 'remotes/gullydwarf-cfdv/is330'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 25 Jun 2011 18:08:04 +0000 (13:08 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 25 Jun 2011 18:08:04 +0000 (13:08 -0500)
commit4765a52b1f1481026079ea7f7a6ecbb65f0fcac1
treee23c518ccab549533cb7407d42d86da8d208838b
parentf7b7511b7b7c4cb73c196d5a6d38314a1162dae4
parent0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada
Merge remote branch 'remotes/gullydwarf-cfdv/is330'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/gallery.html
mediagoblin/templates/mediagoblin/user_pages/gallery.html