Merge remote branch 'joar/b681-comments_from_reviewing_video'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 13 Dec 2011 20:35:15 +0000 (21:35 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 13 Dec 2011 20:35:15 +0000 (21:35 +0100)
commit8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e
tree1e4748ff7d5957bfac141b545f93fde1e22d4985
parentbb3b9e4090706e1e9815c5132c01b9e706e31360
parent4535f7597f112443d8997bbd6b8a445612c2440d
Merge remote branch 'joar/b681-comments_from_reviewing_video'

* joar/b681-comments_from_reviewing_video:
  Bug 681 - Comments from reviewing the new video merge
mediagoblin/media_types/__init__.py