]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0c31c3d 2960193)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 5 Jan 2010 08:50:04 +0000 (22:50 -1000)
committerEvan Prodromou <evan@status.net>
Tue, 5 Jan 2010 08:50:04 +0000 (22:50 -1000)
commit4e84c523b7911b8b6cb6113b9c91cbfdc47f027d
tree7cf668ac187923557b955b0a46428056fe0ad1fatree | snapshot
parent0c31c3d80c379c3db1c063e3caba0d450bb83ab7commit | diff
parent2960193cc4f9be74713896ddb0e7debb1190c163commit | diff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
classes/Memcached_DataObject.php
classes/Memcached_DataObject.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)