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

Aleksander Machniak

2016-03-17 ca332d58628a3b88f22795d9b34d7d0ad8c1b97a

../../program/resources does not exist in tree f8859ac31f42b9d0c115fc09b7f500931eeb2d77