...
[15:48:17 CDT(-0500)] <athena> since you have to hand-edit that anyway
[15:56:16 CDT(-0500)] <EricDalquist> I just merged 77 commits from uw-master into uPortal master
[15:56:26 CDT(-0500)] <EricDalquist> 73 of those were working on event aggregation