Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 31 Aug 2011 19:28:25 +0000 (15:28 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 31 Aug 2011 19:28:25 +0000 (15:28 -0400)
commitb53391e500abef00dcf6728eb367a10e5fb8478c
tree0b5890b5d0516740da6ceb1c00657e9b05f61d28
parent7dd532b63fcaa099e5096c44f0ebb3809a445ce4
parent7cfbe7c2d498b45a9f8714d232a733220fd4a92c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x