Merge remote-tracking branch 'joar/exif-rebase'
authorJoar Wandborg <git@wandborg.com>
Sat, 28 Jan 2012 17:47:01 +0000 (18:47 +0100)
committerJoar Wandborg <git@wandborg.com>
Sat, 28 Jan 2012 17:47:01 +0000 (18:47 +0100)
commit3d0d3bc97270095fae5f9a2508068631c46a5e61
tree76778fcacaae35fc5662f276dab512a07bcee186
parentd7bec8577ea1b4d83df097f586324445fed1ef50
parent9542a2ba076b7e00e79d7adb1a4e90a095427645
Merge remote-tracking branch 'joar/exif-rebase'
mediagoblin/templates/mediagoblin/user_pages/media.html