Merge remote-tracking branch 'cweb/master'
authorAditi <aditi.iitr@gmail.com>
Thu, 4 Jul 2013 16:05:22 +0000 (21:35 +0530)
committerAditi <aditi.iitr@gmail.com>
Thu, 4 Jul 2013 16:05:22 +0000 (21:35 +0530)
sage aborts
Merge branch master of git://gitorious.org/mediagoblin/mediagoblin.git


Trivial merge