From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 8 Jul 2010 00:32:55 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/kgodey/philo into kgodey
X-Git-Tag: philo-0.9~53^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/5a212263dac7562484538d03c418c1878af9d5ca

Merge branch 'master' of git://github.com/kgodey/philo into kgodey
---

5a212263dac7562484538d03c418c1878af9d5ca