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

Andy Wermke

2013-04-04 92cd7f34b07e86062f2c024039e3309768b48ce6

 program/lib/Roundcube/rcube_content_filter.php

@@ -2,8 +2,6 @@

/*
 +-----------------------------------------------------------------------+
 | program/include/rcube_content_filter.php                              |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2011, The Roundcube Dev Team                            |
 |                                                                       |
@@ -13,7 +11,6 @@
 |                                                                       |
 | PURPOSE:                                                              |
 |   PHP stream filter to detect evil content in mail attachments        |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+
@@ -23,7 +20,7 @@
 * PHP stream filter to detect html/javascript code in attachments
 *
 * @package    Framework
 * @subpackage Core
 * @subpackage Utils
 */
class rcube_content_filter extends php_user_filter
{