]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 14:19:27 +0000 (09:19 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 14:19:27 +0000 (09:19 -0500)
commit9898bbdeb29c02ee1864a41bd747ac3ec7505e54
tree5afab0e28ed677645d0727af4891960a21d27f12
parent7f471bde231071e3512f203ceca4b830ac2204a1
parent5df61141d28426329d2f4e50e61c131d43d1e405
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Conflicts:
plugins/OStatus/lib/activity.php