]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Mon, 25 Jan 2010 23:13:09 +0000 (18:13 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 25 Jan 2010 23:13:09 +0000 (18:13 -0500)
commit663e4e02a1b3b1c104c2c3db19e524a486c3d981
tree048e2f67c10f74e3b510646f7b955d45baa49253
parent1ab24832960eef698731cf0d3e72fccfa336392d
parente26a843caf9f6bb0d11a7128884db235ededcce0
Merge branch 'master' into testing

Conflicts:
lib/queuemanager.php
actions/apistatusesupdate.php
classes/Memcached_DataObject.php
lib/queuemanager.php