Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 20:29:58 +0000 (16:29 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 20:29:58 +0000 (16:29 -0400)
commite1129f34d505a0dcfa28ce765c5005ee44d242e3
tree914d14d3ceb0c02933b93a649b9d4b0db9da0d74
parent467b840c446c0a2760e1d6985c88b02111b9b9f2
parent70fbdb6f94848c5c08b0b6e30905d875156b8233
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing