Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 29 Mar 2013 13:09:36 +0000 (08:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 29 Mar 2013 13:09:36 +0000 (08:09 -0500)
commit047d8d5871ee8ee97ea52a78512fe5b2da51b8cc
treec8bdf7e4ebb83ee8dd25930459c33084cd434ac6
parent6c6e9911f5556bcd1f287afa39d4cc6d14d9c6c1
parent2ef2f46e73845dcd55666cad49c5a17908bf5b46
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin