[commits] Horde branch develop updated. 393bcdacb17fd9b550dc08e4c9eb900669fefeb9

[Michael M Slusarz]

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

from: 5fbae17db3e99b5891c1c6bb446c01e58067fba7

d08653c MDN checking should be done on message mailbox, not view mailbox (which may be a search mailbox)
7221687 Simplify
393bcda Merge branch 'master' into develop

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

commit d08653cce66defa3e6f6971af780dc3699080ad7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Apr 4 17:12:59 2012 -0600

    MDN checking should be done on message mailbox, not view mailbox (which may be a search mailbox)

 imp/message.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d08653cce66defa3e6f6971af780dc3699080ad7

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

commit 7221687302a2b76847eec1858aea7ceb889227d2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 00:34:55 2012 -0600

    Simplify

 imp/lib/Mailbox.php |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/7221687302a2b76847eec1858aea7ceb889227d2

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

commit 393bcdacb17fd9b550dc08e4c9eb900669fefeb9
Merge: 5fbae17 7221687
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 00:40:43 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/lib/Mailbox.php
    	imp/message.php

 imp/lib/Mailbox.php |   27 ++++++++++-----------------
 imp/message.php     |    2 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/393bcdacb17fd9b550dc08e4c9eb900669fefeb9