Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql