Merge branch 'master' into debian debian/0.2-1
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 15 Mar 2010 18:29:18 +0000 (14:29 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 15 Mar 2010 18:29:18 +0000 (14:29 -0400)
commit1e2bfaac19b663141a1c3b93218298ec482e5624
tree9cc094746050b99d4b13a470d356363c17d409cf
parente4d687e94bb30a22e56459398b3ca51116254824
parentb14b7a6e6921c52ae416dac2c4bc955a90812fab
Merge branch 'master' into debian