diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/setup.php-presetup mezzanine_patched_phpki/phpki-0.82/setup.php-presetup --- phpki/phpki-0.82/setup.php-presetup 2008-12-17 03:28:03.000000000 +0100 +++ mezzanine_patched_phpki/phpki-0.82/setup.php-presetup 2008-12-17 03:27:32.000000000 +0100 @@ -635,7 +635,6 @@ ?>