]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b5a334 eab6d1c)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 23 Dec 2009 18:31:27 +0000 (10:31 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 23 Dec 2009 18:31:27 +0000 (10:31 -0800)
1  2 
classes/Memcached_DataObject.php patch | diff1 | diff2 | blob | history

diff --cc classes/Memcached_DataObject.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)