commit fcc67c203e7246e4cd92f1fdeea2f16e3d3562bd Merge: 453589d 1f20f59 Author: Alexandre Allaire <alexandre.allaire at mail.mcgill.ca> Date: Tue Dec 4 21:39:48 2012 -0500 Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in