Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorSamantha Doherty <sammy@status.net>
Sat, 17 Sep 2011 22:27:30 +0000 (18:27 -0400)
committerSamantha Doherty <sammy@status.net>
Sat, 17 Sep 2011 22:27:30 +0000 (18:27 -0400)
commit95e76bf21aaa43aaac0ab71814de2faf4a060877
tree82f02bd89c8680e736629792810043114fc73bc6
parentedbe03b193dec4b9ca3ff8044f2e87a77caa9cd9
parenta4593f9cd33905124042dd95d4b849853c3dc394
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x