Merge remote branch 'remotes/osamak/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 8 Aug 2011 14:47:10 +0000 (09:47 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 8 Aug 2011 14:47:10 +0000 (09:47 -0500)
commit03be33ab292f8696dad7d7929e8e1fc2cedc069b
tree364c323fb373a9c43fb087ae9868fde129b79283
parentdffbc4e0990c8f74bc8408c0ac94e0ad65b1d29e
parent8f4c9b813d306228e1eecec7551d46902c264189
Merge remote branch 'remotes/osamak/master'

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