Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO ... Conflicts: zm.conf.in		2013-11-08 11:22:09 -05:00
..
classic	Merge branch 'master' into mysql2PDO	2013-11-08 11:22:09 -05:00
mobile	clean out autogenerated files	2013-09-12 14:43:57 -04:00
xml	clean out autogenerated files	2013-09-12 14:43:57 -04:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00