]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 16:52:40 +0000 (11:52 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 16:52:40 +0000 (11:52 -0500)
commit8eb66467165e107d0c80c64f6c429fed1d1101d5
tree90e1c71ccaeb12d2ec8cc23e68832a9950295d54
parent7f1b8720887a6e97df15bc761635418c75870711
parente903ff0525099be10681123c42a2b2d55c8649b6
Merge branch 'testing'

Conflicts:
plugins/Facebook/facebookaction.php
plugins/Facebook/facebookhome.php
plugins/Facebook/facebookutil.php