PirateBox-Dev/PirateBoxScripts_Webserver — pull request #96 by Liblor (2014-12-27 14:14:47+00:00)
Title: Solves merge conflicts

This solves the "merge conflicts" in the development branch --> #95