[Dev-flock] r215 - in huginmunin/branches/sept-competition/web/src: . web_app web_app/Prototype/Main web_app/media/main

[lucy]

-r 211:214 merged trunk changes onto branch/sept-competition. just making sure the process works. next i'll be altering svn access to keep trunk commit authorized while opening up the branch, so expect some test commits.

Modified:
   huginmunin/branches/sept-competition/web/src/test.test
   huginmunin/branches/sept-competition/web/src/web_app/IMPLE
   huginmunin/branches/sept-competition/web/src/web_app/Prototype/Main/main.html
   huginmunin/branches/sept-competition/web/src/web_app/Prototype/Main/urls.py
   huginmunin/branches/sept-competition/web/src/web_app/Prototype/Main/views.py
   huginmunin/branches/sept-competition/web/src/web_app/media/main/main.js
   huginmunin/branches/sept-competition/web/src/web_app/urls.py