Pull changes and resolve merge conflict.
authorAditi <aditi.iitr@gmail.com>
Wed, 28 Aug 2013 17:58:09 +0000 (23:28 +0530)
committerAditi <aditi.iitr@gmail.com>
Wed, 28 Aug 2013 17:58:09 +0000 (23:28 +0530)
commit922599990d07d4ab1eb34cd57d59a4ced6882884
tree743e8a7572129dd4b905b535bf2a306886125304
parent7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6
parent7904402750df610102bc487dab4b4a3e01e15b91
Pull changes and resolve merge conflict.
mediagoblin/media_types/image/__init__.py