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)
commit81b6b58e33f55054b7e5dd546f06dbdb5696ed92
tree7dddea4daac884f70d021fb11f1d02d560c0cd10
parent2e258454f396af9f95092b9564eee08179ff6be1
parentc74aea589d5a79d7048470d44e457dffc8919ad3
Merge branch 'master' into testing

Conflicts:
lib/stompqueuemanager.php
classes/Memcached_DataObject.php
lib/cache.php
lib/default.php
lib/statusnet.php
plugins/MemcachePlugin.php