Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 27 Jan 2011 15:56:02 +0000 (10:56 -0500)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 27 Jan 2011 15:56:02 +0000 (10:56 -0500)
commit9cbfba073af94429cef94c9334efa9a5ad2949d4
treea9fc7ed9f83de0fa90db644db6a5dbfd1ca2d41b
parente47a299b1e562a3e6e16cc3c726b84a5a8f542ef
parent244ab9ec6717050fb50d58ebcb9d38b4f02647f6
Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

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