From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 3 Mar 2011 22:14:02 +0000 (-0500)
Subject: Merge branch 'search'
X-Git-Tag: philo-0.9~16^2~15
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/faa929ce6af603e83247f3f5f8c6f6c22aff48bc

Merge branch 'search'
---

faa929ce6af603e83247f3f5f8c6f6c22aff48bc