# HG changeset patch # User Dan # Date 1194625134 18000 # Node ID ed13b72b13cc2bb68096db65a467f54e5b7e6530 # Parent e876c75a9149c2e5e8a47e23a335e8a18f5856c1# Parent c9fd175289aa63afceac458405101b6da3e6348c Merge in some minor fixes from stable diff -r e876c75a9149 -r ed13b72b13cc includes/sessions.php --- a/includes/sessions.php Fri Nov 09 11:15:06 2007 -0500 +++ b/includes/sessions.php Fri Nov 09 11:18:54 2007 -0500 @@ -206,8 +206,8 @@ var $acl_deps = Array(); /** - * Our tell-all list of permissions. - * @access private - or, preferably, protected + * Our tell-all list of permissions. Do not even try to change this. + * @access private * @var array */ @@ -2803,8 +2803,8 @@ var $acl_deps = Array(); /** - * Our tell-all list of permissions. - * @access private - or, preferably, protected...too bad this has to be PHP4 compatible + * Our tell-all list of permissions. Do not even try to change this. + * @access private * @var array */ diff -r e876c75a9149 -r ed13b72b13cc includes/template.php diff -r e876c75a9149 -r ed13b72b13cc index.php --- a/index.php Fri Nov 09 11:15:06 2007 -0500 +++ b/index.php Fri Nov 09 11:18:54 2007 -0500 @@ -1,6 +1,6 @@