Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO ... Conflicts: zm.conf.in		2013-11-08 11:22:09 -05:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	more updates and removal of escaping and quoting	2013-11-04 12:43:34 -05:00
config.php.in	Merge branch 'master' into mysql2PDO	2013-11-08 11:22:09 -05:00
control_functions.php	Migrate svn to git	2013-03-17 00:45:21 +01:00
database.php	improve error reporting	2013-11-07 10:58:27 -05:00
functions.php	more updates and removal of escaping and quoting	2013-11-04 12:43:34 -05:00
lang.php	Migrate svn to git	2013-03-17 00:45:21 +01:00
logger.php	fix missing n	2013-10-17 17:01:37 -04:00