Ian Denhardt 27ef3b1d90 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline ...

Conflicts:
	actions/public.php

2011-03-15 12:42:58 -04:00

..

LC_MESSAGES

Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

2011-03-15 12:42:58 -04:00