Merge branch 'testing'
authorBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)
commitb77c029aa811e08027d6dc8ed7d46be397eb6fb3
treefac7f311276c9b7a6695ed3fc4962d6ec715216d
parent029aa0c61c9942c0688fd3dc9aa2893311543db1
parent7f9ab683b259fc93d507eb705c84af0cfd2fae5b
Merge branch 'testing'

Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/classes/Ostatus_profile.php