Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:21:14 +0000 (20:21 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:21:14 +0000 (20:21 -0500)
commit0f6ab7da86c67557233a4785d52c81bcc6da79f3
tree924d0f9776d78889e0b36a262f06cf08da373a2b
parentf4f9d7ca95a7a00096622961c00d3c941ee846b7
parent64598a79a9648416e9cc49349e57190792cc59f2
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin