Brion Vibber 5b49366f49 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php
2010-10-04 11:42:16 -07:00
..
2010-10-01 21:45:19 +02:00
2010-10-01 21:45:19 +02:00
2010-10-01 21:45:19 +02:00
2010-10-01 21:45:19 +02:00
2010-10-01 21:45:19 +02:00