Merge remote-tracking branch 'refs/remotes/chemhacker/bug402_nicer_skin_for_video'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 13 Mar 2012 20:40:59 +0000 (15:40 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 13 Mar 2012 20:40:59 +0000 (15:40 -0500)
commit19e67f595524aa1374b7be8b1790a3f9fc720c2f
tree2047a28cbefb5fb5e3cf218ee609a92e96e3f9a4
parent849cf91fc8feeed308b5f54fd53d1940bf23058b
parent560e22e7d27d8c2642c076ed8c30703b00e00c41
Merge remote-tracking branch 'refs/remotes/chemhacker/bug402_nicer_skin_for_video'

Conflicts:
mediagoblin/templates/mediagoblin/media_displays/video.html
mediagoblin/templates/mediagoblin/media_displays/video.html