Merge branch 'bug_7740' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 03:22:42 +0000 (23:22 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 03:22:42 +0000 (23:22 -0400)
commit92433747b54ff3b91a0e301ea57e488ab26f74a3
tree7f40312e67d33f902b59341f9f4c7848d3549fd6
parentd9916b563591af79f0bcec39c86a3eee9e1e03d3
parent42bf3faca4f606eede72f7415db7dab938ba3d5d
Merge branch 'bug_7740' into 3.12-master
installer/data/mysql/sysprefs.sql
installer/data/mysql/updatedatabase.pl