Craig Andrews 32084e33a2 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-02-16 10:25:57 -05:00
..
2010-02-16 10:25:57 -05:00
2010-02-16 10:25:57 -05:00