Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 19:31:42 +0000 (14:31 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 19:31:42 +0000 (14:31 -0500)
commit127d8a682ec0ac580b90a8f8edc433459c1aec81
tree408b6ef8cb68ed80eddf9d7fdb6e98582abaff64
parentba94c4b04afa410cc5829df5f6656ecb1b5d1937
parentd72892f5df432d902ac23de4642d10146cee28bb
Merge remote branch 'mlc/master'