]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Mon, 8 Mar 2010 22:22:23 +0000 (17:22 -0500)
committerCraig Andrews <candrews@integralblue.com>
Mon, 8 Mar 2010 22:22:23 +0000 (17:22 -0500)
commit714d920faea302b55857cc3bec4e9e6160ea136a
treecffa5ee7a3261ad24b272cb3ced16a6c1dcafad1
parentc187bf55974347f7ddb4f28714af57861dce8f08
parent51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee
Merge branch '0.9.x' into 1.0.x

Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
EVENTS.txt
classes/User.php
classes/statusnet.ini
db/statusnet.sql
lib/statusnet.php
lib/util.php
plugins/Xmpp/Fake_XMPP.php