Updating branch...
authornattily pigeonfowl <nattilypigeonfowl@gmail.com>
Tue, 16 Apr 2013 20:28:04 +0000 (16:28 -0400)
committernattily pigeonfowl <nattilypigeonfowl@gmail.com>
Tue, 16 Apr 2013 20:28:04 +0000 (16:28 -0400)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into ticket-660


Trivial merge