From: Stephen Burrows Date: Fri, 28 Jan 2011 16:01:36 +0000 (-0500) Subject: Merge branch 'master' of http://github.com/ithinksw/philo X-Git-Tag: philo-0.9~21^2~11 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/ba3be778c450d4f8d743bf395c0c2f7a88bf804d?hp=ba3be778c450d4f8d743bf395c0c2f7a88bf804d Merge branch 'master' of github.com/ithinksw/philo ---