From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 27 Jan 2011 15:56:02 +0000 (-0500)
Subject: Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/9cbfba073af94429cef94c9334efa9a5ad2949d4

Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

* 'gilbert' of git://github.com/lapilofu/philo:
  Integrated Murano into Gilbert.
---

9cbfba073af94429cef94c9334efa9a5ad2949d4