]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 16 Feb 2010 17:22:02 +0000 (09:22 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 16 Feb 2010 17:22:02 +0000 (09:22 -0800)
Conflicts:
lib/stompqueuemanager.php

1  2 
classes/Memcached_DataObject.php
lib/cache.php
lib/default.php
lib/statusnet.php
plugins/MemcachePlugin.php

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