[commits] Horde branch develop updated. 7b62b4cae23717b11528acc17300f04cb3ee70a2

[Michael M Slusarz]

The branch "develop" has been updated.
The following is a summary of the commits.

from: 7731af9e81cb0e18d16801c72cd7e0b600f52f0b

7883f89 [mms] Fix reporting as innocent in mobile view.
7b62b4c Merge branch 'master' into develop

-----------------------------------------------------------------------

commit 7883f89efc7c3e305b50ceba4ed6b874b75511ad
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Dec 27 15:47:52 2011 -0700

    [mms] Fix reporting as innocent in mobile view.

 imp/docs/CHANGES     |    1 +
 imp/mailbox-mimp.php |    2 +-
 imp/message-mimp.php |    2 +-
 imp/package.xml      |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7883f89efc7c3e305b50ceba4ed6b874b75511ad

-----------------------------------------------------------------------

commit 7b62b4cae23717b11528acc17300f04cb3ee70a2
Merge: 7731af9 7883f89
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Dec 27 15:48:45 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/package.xml

 imp/docs/CHANGES     |    1 +
 imp/mailbox-mimp.php |    2 +-
 imp/message-mimp.php |    2 +-
 imp/package.xml      |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7b62b4cae23717b11528acc17300f04cb3ee70a2