]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 22 Mar 2010 20:56:16 +0000 (13:56 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 22 Mar 2010 20:56:16 +0000 (13:56 -0700)
commite89908f26140c217e01b2f8f755712f38f3935f3
tree6b241fc2e33f3528cf48b415ef67906826b02e24
parent714d920faea302b55857cc3bec4e9e6160ea136a
parenteb563937df921e5fc67ca0c87e229feb2907fd19
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
lib/channel.php
scripts/imdaemon.php
actions/shownotice.php
classes/User.php
lib/channel.php
lib/command.php
lib/queuemanager.php
lib/statusnet.php
lib/util.php
scripts/imdaemon.php