* Resolved conflicts of merging CodeSnip.todo from branches/proxy-server:164-203 branch and trunk.
* Flagged some todos as complete.
Authored by: delphidabbler 2009-08-17
Parent: [r206]
Child: [r208]
