From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Fri, 10 Jun 2011 18:52:48 +0000 (-0400)
Subject: Merge branch 'release' into develop
X-Git-Tag: philo-0.9.1^2~8^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/87170ecd588c3472ee2d1ef30b568fb9fb756e70?hp=87170ecd588c3472ee2d1ef30b568fb9fb756e70

Merge branch 'release' into develop

Conflicts:
	philo/contrib/sobol/models.py
	philo/contrib/sobol/search.py
---