Brion Vibber b77c029aa8 Merge branch 'testing'
Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
2010-08-16 10:06:52 -07:00
..
2010-07-28 17:50:36 -04:00
2010-08-06 22:51:45 -05:00
2010-08-16 10:06:52 -07:00