PROJECT: fixed 64-bit build on Windows, added proper 64-bit mariadb library, removed unneeded SSL libraries
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Added a helper procedure to calculate the decimal value of the passed ip address for easy configuration
Merge pull request #457 from dacrybabysuck/master

Added helper procedure to update zone_id with a calculated decimal value of a passed ip
Remove duplicated useless conditional
Merge pull request #458 from Cloudef/cleanup

Remove duplicated useless conditional
Merge branch 'master' of https://github.com/DarkstarProject/darkstar