]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 22:02:10 +0000 (15:02 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 22:02:10 +0000 (15:02 -0700)
commit04ca706601a2a3b556cc52fa21b61fcd842c4e87
treedf79bc06e080623c4d2107ae8ce212160c7669b1
parentb26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1
parent81e06530800bce5eb60eca362d4c21453632183a
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
actions/confirmaddress.php
actions/othersettings.php
README
actions/confirmaddress.php
actions/othersettings.php
actions/showstream.php
classes/Profile.php
lib/command.php