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)
commit07e61ef13a62752d1321f2e9b6e6ff62d474023c
treed12ee72a2368d68174b81a4c147f4c22f60d9f36
parenta1e299d60e135905e39358fe5dc1efcd64172daf
parent860fa806ee3af0260b9f8f6f02dd606fb55678f5
Merge branch 'ticket-679' of gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin