From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 11 May 2011 21:21:35 +0000 (-0400)
Subject: Merge branch 'sobol-templates-hotfix' into release
X-Git-Tag: philo-0.9~12^2~19
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/943e8bc4af0c11b0ace3811199e3b0844c4c3fbc

Merge branch 'sobol-templates-hotfix' into release
---

943e8bc4af0c11b0ace3811199e3b0844c4c3fbc