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

Andy Wermke

2013-04-04 92cd7f34b07e86062f2c024039e3309768b48ce6

 composer.json-dist

@@ -24,7 +24,7 @@
            }
        }
    ],
    "require" : {
    "require": {
        "pear-pear/Mail_Mime": ">=1.8.1",
        "pear-pear/Mail_mimeDecode": ">=1.5.5",
        "Net_SMTP": "dev-master",