]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 2 Feb 2010 22:00:10 +0000 (17:00 -0500)
committerCraig Andrews <candrews@integralblue.com>
Tue, 2 Feb 2010 22:00:10 +0000 (17:00 -0500)
commit057ec1fceacbfec1f755a5bc6700a188aa70e33f
tree297839a71d9d3a7a0a7935d5dbcc9c4a3c6c99bb
parentd14651706cf728f116b7ae44c6a6e37b5eb918a4
parentf60f2c523f2e7018ea923898931287e7a99e8f44
Merge branch '0.9.x' into 1.0.x

Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
EVENTS.txt
actions/showstream.php
classes/User.php
classes/statusnet.ini
db/statusnet.sql
lib/util.php