Merge remote-tracking branch 'upstream/master' into skeletongobblin
authorjpope <jpope@jpope.org>
Sun, 5 Jan 2014 22:55:58 +0000 (16:55 -0600)
committerjpope <jpope@jpope.org>
Sun, 5 Jan 2014 22:55:58 +0000 (16:55 -0600)
commit0172ad000148f1cfe6f5110982c364f46b3d0ecb
treea32f97b2cc6fa6fb41de8263f8c6136922e87799
parent1e298b10c7cba2d27cb19f1aee03134f66ef6e20
parent64eab630bf99e4d92e567628dbfc7cecf4cc27c4
Merge remote-tracking branch 'upstream/master' into skeletongobblin
mediagoblin/templates/mediagoblin/base.html