]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 25 Jan 2010 23:10:59 +0000 (18:10 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 25 Jan 2010 23:10:59 +0000 (18:10 -0500)
1  2 
actions/apistatusesupdate.php
classes/Memcached_DataObject.php
lib/default.php
lib/iomaster.php
lib/queuemanager.php
lib/util.php

Simple merge
Simple merge
diff --cc lib/default.php
Simple merge
Simple merge
Simple merge
diff --cc lib/util.php
Simple merge