]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@status.net>
Fri, 12 Nov 2010 21:32:48 +0000 (13:32 -0800)
committerBrion Vibber <brion@status.net>
Fri, 12 Nov 2010 21:32:48 +0000 (13:32 -0800)
commit65eeb7cba530e45b8d8a25644505619e8af63971
treeff27dab0ad5a6d09720a181eadc7ab018ca8f140
parent5d12ec0532fa9bcc71644186f6ff80f2b527703c
parent6291e8201f90ed50687f7670edc505645ea55bfb
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
actions/newgroup.php