502 Commits (a92266d58e36282ccbccccea7ba5148fa4095377)

Author	SHA1	Message	Date
Melanie	4beb0c9b9b	Merge branch 'master' into careminster-presence-refactor	2011-05-05 09:49:10 +01:00
Diva Canto	d8ee0cbe1c	First stab at cleaning up Caps. Compiles. Untested.	2011-04-30 09:24:15 -07:00