git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cbfba0 62dd9e5)
Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Feb 2011 20:03:28 +0000 (15:03 -0500)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Feb 2011 20:03:28 +0000 (15:03 -0500)
* 'gilbert' of git://github.com/lapilofu/philo:
  Fixed a faulty image reference on menu buttons FOR REAL.


Trivial merge
Foundation for web content management systems using Django.