Merge branch 'bug-1396'

.gitattributes

@@ -0,0 +1,7 @@
+* text=auto
+
+*.php text
+*.html text
+*.phtml text
+*.js text
+*.css text

manager/application/controllers/ErrorController.php

@@ -32,4 +32,3 @@ class ErrorController extends Zend_Controller_Action
 
     }
 }
-

manager/library/config/Config.php

@@ -101,4 +101,3 @@ class Config {
         return $this->config;
     }
 }
-?>

manager/library/date/exception.HumanReadableTimeException.php

@@ -34,4 +34,3 @@ class HumanReadableTimeException extends BaseException {
     }
     */
 }
-?>

manager/library/date/testHumanReadableTime.php

@@ -13,4 +13,3 @@ print 'Day: ' . HumanReadableTime::Seconds2HR($hrf, 'd') . "\n";
 print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
 print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
 print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
-

manager/library/exception/exception.Base.php

@@ -95,4 +95,3 @@ class BaseException extends Exception {
     }
 
 }
-?>