]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Fri, 19 Mar 2010 01:57:38 +0000 (20:57 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 19 Mar 2010 01:57:38 +0000 (20:57 -0500)
commitac609e804078cf70fcc02b36aa1eb40115354715
treec206723a0fe28fd62f8d2838f589a42ec7523af5
parent17c50f338ceb574780476f6b788f48e2d7d06017
parent4a6c9e445149e42a4f81d5140296e7770c60bc6c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php