Brion Vibber 81b6b58e33 Merge branch 'master' into testing
Conflicts:
	lib/stompqueuemanager.php
2010-02-16 09:22:02 -08:00
..
2010-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-02-11 17:06:57 -05:00