Merge branch 'ticket-679' of gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin
authortilly-Q <nattilypigeonfowl@gmail.com>
Thu, 1 Aug 2013 00:49:07 +0000 (20:49 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Thu, 1 Aug 2013 00:49:07 +0000 (20:49 -0400)

Trivial merge