Merge branch 'jsnider2-master' v3.5.6
author Rainer Volkrodt
()
committer Rainer Volkrodt
()
commit 7bdf2373884a4866f1135bebb8a88ecf8d17f15d
tree 701aef8f86139308c18ba024aeb8ecbbb710929b
parent 22858b4eceea58dc22b417499ed26d8d58595eeb
parent 6c282797ed387002bdb75132f5cba2a98d436829
Merge branch 'jsnider2-master'

Attempt to merge
includes/mysql_functions.php
includes/mysqli_functions.php
install/install.php