Merge branch 'release' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 10 Jun 2011 18:52:48 +0000 (14:52 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 10 Jun 2011 18:57:58 +0000 (14:57 -0400)
commit87170ecd588c3472ee2d1ef30b568fb9fb756e70
tree28c9fda53141a5d7b72d1a4c0149448617d261f0
parentd1a2c359e5f3e6b7913808119a6a8e71745ee3ed
parent3f0672f752c59dbcba206fee9f42dd145182817c
Merge branch 'release' into develop

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