Merge pull request #133 from cwickert/release-0.9-canned-responses

Thomas B.

2013-10-07 a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a

 plugins/zipdownload/zipdownload.php

@@ -258,11 +258,7 @@
   /**
    * Helper function to convert filenames to the configured charset
    */
<<<<<<< HEAD
   private function _convert_filename($str, $from = RCMAIL_CHARSET)
=======
   private function _convert_filename($str)
>>>>>>> 4922472... Fix zipdownload plugin issue with filenames charset (#1489156)
   {
        $str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);