Craig Andrews c187bf5597 Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
2010-02-24 20:52:45 -05:00
..
2010-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-02-20 12:03:32 -05:00
2010-02-16 09:25:09 -08:00
2010-02-24 20:52:45 -05:00
2010-02-24 20:52:45 -05:00