Merge remote branch 'upstream/master' into dev/mount_storage
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Mon, 8 Aug 2011 18:00:57 +0000 (20:00 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Mon, 8 Aug 2011 18:00:57 +0000 (20:00 +0200)
commitff94b4ce388a577a930ee98c4f82d961585ac6c3
tree5ce6b02ca6cacd613baab70c5a755aa6feff15d1
parenteea315623fdff018f389dad2ab037a2b2aaf982b
parent4100798b86106832373b5afca77960edec5cdcc8
Merge remote branch 'upstream/master' into dev/mount_storage

Conflicts:
mediagoblin/storage.py
mediagoblin/storage.py