]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Sun, 11 Apr 2010 00:56:11 +0000 (17:56 -0700)
committerBrion Vibber <brion@pobox.com>
Sun, 11 Apr 2010 00:56:11 +0000 (17:56 -0700)
commit1eeb23e1e3b77de056791a74cd3e4f5c02d68510
treea636518ebfc9bf41c2b0b0a916c14f1ee37df634
parentaf06c554a0d8c4eeab801a9550d951845d40350a
parentedd883d3b009788049a9326bd6bdcc7846f87a8a
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
actions/confirmaddress.php