Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)
commit73079ac4b8a8b3b355867a1e98aca63313597ad0
tree614424e7222f81a29f82e580f5dc97baebffb1f6
parent1df68a3524d92caee5601a8acc011ac8e1fe16d4
parent914b8bcde3e01c2dd3e5679fb7733fc194b34d68
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
mediagoblin/db/mongo/models.py
mediagoblin/db/mongo/models.py