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

Thomas Bruederli

2012-12-26 c942e4a2e9a97743850b4178ea66b3b33956e7f7

program/lib/washtml.php does not exist in tree 8fda2746e6cd6e69fc74427c297f3113665fce00