]> 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: 104d300 0e852de)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Fri, 22 Jan 2010 19:18:21 +0000 (14:18 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 22 Jan 2010 19:18:21 +0000 (14:18 -0500)
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. :-)