]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Sat, 18 Dec 2010 01:13:21 +0000 (17:13 -0800)
committerBrion Vibber <brion@pobox.com>
Sat, 18 Dec 2010 01:13:21 +0000 (17:13 -0800)
commitd8a3a88ec8eae3134694c98e5a9ae42bc30b289f
tree22554406da875404d3417edd91eaeaeef0bb693c
parentbf59eaf602c8319d5ae99d9809b4d4867cb632cd
parentfb8312ebf4537033077917d0003f716206d0d23d
Merge branch '0.9.x' into 1.0.x

Conflicts:
classes/Memcached_DataObject.php
EVENTS.txt
actions/showstream.php
classes/Memcached_DataObject.php
classes/Notice.php
classes/Notice_tag.php
classes/Profile.php
classes/User.php
db/statusnet.sql
lib/router.php
plugins/LdapCommon/LdapCommon.php