]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 6 Dec 2010 20:44:19 +0000 (12:44 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 6 Dec 2010 20:44:19 +0000 (12:44 -0800)
commit2617c40e048aee071b72b4b5f664fab36e6c632d
tree3cf44db45e87eefe00a3e2de0993394dc6620986
parent89f5dd4c182e470f063c760daf59b858cd92f9bf
parent76f3dc32e0e1aa933931b7cc59030ae20bb4f89b
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
classes/User.php
classes/User.php
lib/router.php
lib/util.php