]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Thu, 25 Feb 2010 01:52:45 +0000 (20:52 -0500)
committerCraig Andrews <candrews@integralblue.com>
Thu, 25 Feb 2010 01:52:45 +0000 (20:52 -0500)
commitc187bf55974347f7ddb4f28714af57861dce8f08
tree4398b456d88ce79977959b25ba1a0f6fe0c1d77f
parent20d6a7caed6636c28cc7b95c584549691dff4388
parent8914b69d5055c1bc7d0604ee338ffdaf6b0a8606
Merge branch '0.9.x' into 1.0.x

Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
EVENTS.txt
classes/User.php
classes/statusnet.ini
db/statusnet.sql
lib/command.php
lib/queuemanager.php
lib/util.php
plugins/Xmpp/XmppPlugin.php