Conflicts: include/config.php update.php
This is a dummy file to prevent Git from ignoring this empty directory. vim: et sw=4 sts=4