[commits] Horde branch develop updated. 489e1830c6e1fc531bd8d9c3188c11b1afcf27e9

[Michael M Slusarz]

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

from: d7f4abb80f99167622895088828db9282a1819fe

c68fbd7 [mms] Fix deleting virtual folders in dynamic view.
9694036 phpdoc
162f0f6 [mms] Fix updating log information when replying/forwarding in dynamic view.
489e183 Merge branch 'master' into develop

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

commit c68fbd75c959703613f7ad089bef3c62dd2c3efb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 13:18:35 2011 -0700

    [mms] Fix deleting virtual folders in dynamic view.

 imp/docs/CHANGES             |    1 +
 imp/lib/Ajax/Application.php |   15 ++++-----------
 imp/lib/Mailbox.php          |   13 +++++++++++++
 imp/package.xml              |    4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

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

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

commit 9694036f1f0363e9f3c0aee14f30910b0abb781c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 14:16:34 2011 -0700

    phpdoc

 imp/lib/Ajax/Application.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/9694036f1f0363e9f3c0aee14f30910b0abb781c

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

commit 162f0f69f17c72a6a5a6e0d742833825ded73bd2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 15:13:13 2011 -0700

    [mms] Fix updating log information when replying/forwarding in dynamic view.

 imp/docs/CHANGES       |    1 +
 imp/js/compose-dimp.js |    4 ++--
 imp/package.xml        |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/162f0f69f17c72a6a5a6e0d742833825ded73bd2

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

commit 489e1830c6e1fc531bd8d9c3188c11b1afcf27e9
Merge: d7f4abb 162f0f6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 16:08:05 2011 -0700

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

 imp/docs/CHANGES             |    2 ++
 imp/js/compose-dimp.js       |    4 ++--
 imp/lib/Ajax/Application.php |   29 +++++++++++------------------
 imp/lib/Mailbox.php          |   13 +++++++++++++
 imp/package.xml              |    3 ++-
 5 files changed, 30 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/489e1830c6e1fc531bd8d9c3188c11b1afcf27e9