Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2016-04-21 f0fa9324d83ea1bd57f0b702e3b419f7194169cb

 composer.json-dist

@@ -28,7 +28,7 @@
        "pear-pear.php.net/net_idna2": "~0.1.1",
        "pear-pear.php.net/mail_mime": "~1.10.0",
        "pear-pear.php.net/net_smtp": "~1.7.1",
        "pear-pear.php.net/crypt_gpg": "~1.4.0",
        "pear-pear.php.net/crypt_gpg": "~1.4.1",
        "roundcube/net_sieve": "~1.5.0"
    },
    "require-dev": {