Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 14:59:20 +0000 (10:59 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 14:59:20 +0000 (10:59 -0400)
commit0b7abf159593daa43ce389810adb0f3c3401b941
tree4f2c78566850161edf4e987bcdc686255e835793
parent13e1fab919bff215808e7d4670dacb5eb0450f19
parent670288e68fefbb3357f0eebfbde1a1939617e2ac
Merge branch 'master' of gitorious.org:statusnet/mainline