Merge pull request #248 from flanpy/master

Thomas B.

2014-12-21 8e7ed506c41ea8b8f725f7e122ca6f0b091de5e4

 program/lib/Roundcube/bootstrap.php

@@ -408,7 +408,7 @@

if (!function_exists('idn_to_utf8'))
{
    function idn_to_utf8($domain, $flags=null)
    function idn_to_utf8($domain)
    {
        static $idn, $loaded;

@@ -430,7 +430,7 @@

if (!function_exists('idn_to_ascii'))
{
    function idn_to_ascii($domain, $flags=null)
    function idn_to_ascii($domain)
    {
        static $idn, $loaded;