]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 30 Apr 2010 20:15:53 +0000 (13:15 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 30 Apr 2010 20:16:13 +0000 (13:16 -0700)
commitcae1329f3bca1f5f1fbfdb1d96b38cbb790fbe00
tree21ae74d08b6496c7d7fafbe95a9b147a9ac56cc0
parent5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624
parentf8883367184e4fd31dc819d5e1257d0eee11eb10
Merge branch '0.9.x' into 1.0.x

Conflicts:
lib/util.php
README
index.php
lib/common.php
lib/util.php