Ian Denhardt 31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline ... Conflicts: plugins/OStatus/actions/ostatusinit.php		2011-05-23 21:50:48 -04:00
..
statusnet.po	Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline	2011-05-23 21:50:48 -04:00