Checked in a prototype of stamping-as-annotations to my svn [[sandbox][http://svn.osafoundation.org/sandbox/grant/stamping][sandbox]].
Checked in a couple of minor testing-related fixes.
Ongoing patch reviews, intern support.
Looked into a subtle timing issue with DanSteinicke (since written up as 6243).
Thought a little about doing VTODOs: This will probably wait for stamping changes, as some VTODOs probably need to get implemented as Tasks, and others as TaskEvents.
Figured out 6250 (Can't re-subscribe to a calendar after deleting it from the sidebar) with IRC help from ovaltofu.