git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e47a299 244ab9e)
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)
* 'gilbert' of git://github.com/lapilofu/philo:
  Integrated Murano into Gilbert.


Trivial merge
Foundation for web content management systems using Django.