git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b3fd012 15f8778)
Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Fri, 20 May 2011 02:48:27 +0000 (22:48 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Fri, 20 May 2011 02:48:27 +0000 (22:48 -0400)
* 'master' of git://github.com/melinath/philo:
  Minor tweaks to the sobol results templates.
  Removed outdated RecurseNavigationMarker code and added filtered interpretation of the recursenavigation's key argument. Currently falls back to old behavior, but new code should use quoted strings for literals.


Trivial merge
Foundation for web content management systems using Django.