Merge remote-tracking branch 'upstream/master'

2014-09-04 14:04:51 +02:00
parent 798f29e635 62e44cd388
commit 3d1383e8ae
13 changed files with 55 additions and 51 deletions
--- a/Generator/CaptchaGenerator.php
+++ b/Generator/CaptchaGenerator.php
@ -166,4 +166,3 @@ class CaptchaGenerator
        return $phrase;
    }
 }
-
--- a/Generator/ImageFileHandler.php
+++ b/Generator/ImageFileHandler.php
@ -103,4 +103,3 @@ class ImageFileHandler
        }
    }
 }
-