Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Mon, 7 Nov 2011 17:36:52 +0000 (12:36 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 7 Nov 2011 17:36:52 +0000 (12:36 -0500)
commitb5e1cf13e668a739a226c72c4e446c809e7af553
treef91f7feee0e4766f62cfcb20a09bdf4d9ffd92fc
parenta4ec8bb047ba8347e6f11731693a4c06cb044310
parentc2db2483a0e315f0050710bf6f224b2be3290039
Merge branch '1.0.x'