[commits] Horde branch imp_6_1 updated. 4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b

[Michael M Slusarz]

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

from: c3e031a39eea1a457afe432b73d141d39c99db40

cc10612 Expire cached mailbox lists when switching to/from virtual trash
4f9fe8f Merge branch 'master' into imp_6_1

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

commit cc106125c5fcfa1738071a101198b4ec6cca83b8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:01:24 2013 -0600

    Expire cached mailbox lists when switching to/from virtual trash

 imp/lib/Prefs/Special/Trash.php |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

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

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

commit 4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b
Merge: c3e031a cc10612
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:02:40 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Prefs/Special/Trash.php

 imp/lib/Prefs/Special/Trash.php |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b