Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Sun, 25 Aug 2013 03:54:13 +0000 (09:24 +0530)
committerAditi <aditi.iitr@gmail.com>
Sun, 25 Aug 2013 03:54:13 +0000 (09:24 +0530)
commit7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6
tree32f715388cb985b0de84c6c502e7ec98d7f0d885
parent70cc6eb8f383dcc97aeac22216a9da0d65a09085
parente8eec575f3a1d893036ce9b3356d2f56fd15016d
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
mediagoblin/media_types/image/__init__.py
mediagoblin/processing/__init__.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/user_pages/views.py