]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 10 Nov 2009 19:26:49 +0000 (14:26 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 10 Nov 2009 19:26:49 +0000 (14:26 -0500)
commit7ae10c27b0725a7108b63a788affd4d07e37afdc
tree92f952319071ba770136d3e69a82e51040ecb6b5
parent8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72
parent737fe763471bcb6ebd95c318363308a33e28e889
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
lib/util.php
lib/util.php