Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)
commitf79886023fb3d8fb55214e19131740159992aa34
tree1ac322a90da1a9cc25cebf653f6b70bb918808ad
parentf80f5b58a818dfcbbf984fc3e580df5fbf04917b
parentea5a5b15a3d552eaefc4cf220ed155af06f7c8f7
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin