Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:39:37 +0000 (17:39 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:39:37 +0000 (17:39 -0500)
commit532e3d476519b476a82c7cc70500312b0bdc220c
tree5444b19dc6dc9dbfa2dea5d0a35fa5aa4f016599
parent1082ea23d8e7bd9de0c0c1f1614f39c39e1068ef
parente1d74fa7176646600abf717e5884023c9188cd3e
Merge remote branch 'mlc/master'