Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Sun, 16 Oct 2011 08:44:59 +0000 (04:44 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 16 Oct 2011 08:44:59 +0000 (04:44 -0400)
commit9f2fa37ea9cd2e7d48c45edf08dca96202099377
treed69125c9bd542befbf06906fffece0d4e3c9810e
parentd27b7627a545cf882d007bfc3966e229ad9aa39f
parentb42cc773ed16e7cddf78a1525475329d430b1753
Merge branch '1.0.x'