Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 8 Sep 2011 12:59:16 +0000 (08:59 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 8 Sep 2011 12:59:16 +0000 (08:59 -0400)
commit5eba1030ae39038b7b6b0aad5de1043fae43e48d
treeefe3996264fe517c6ec3b3639780606b54e1b3ca
parentb7a5041e80efbe52d358d49ca2a2e94cbb6aff7f
parent449451b8e73645e1b20b66c20ba605f5819809e8
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x