Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 6 Jan 2010 02:38:31 +0000 (21:38 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 6 Jan 2010 02:38:31 +0000 (21:38 -0500)
commitbb67547683fe09e4394b9e8f17d0279526210d59
treecb4739b081998c8e8570cecf6c94bceabd7e21d4
parent29356da8032a96d5d78953e4f2d644d1700b1ad5
parent1f578ec23c4f28aec3e067c34e51e2a6ecb54dd9
Merge remote branch 'jrollins/master'