Index: openacs-4/packages/acs-core-docs/www/variables.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/variables.html,v diff -u -r1.26.2.1 -r1.26.2.2 --- openacs-4/packages/acs-core-docs/www/variables.html 18 Jun 2010 21:29:36 -0000 1.26.2.1 +++ openacs-4/packages/acs-core-docs/www/variables.html 12 Dec 2010 00:07:03 -0000 1.26.2.2 @@ -1,15 +1,24 @@ +<<<<<<< variables.html