[commits] Horde branch develop updated. 4b38b03606870c8e3946289d3486fe831c90df03

[Michael M Slusarz]

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

from: 5699f4bb4fca913e525cca157fb23270710106ff

62a0aeb Fix undefined error
ea4098b Cast to string
c053444 We want to strip access key here, not highlight
70ad136 2nd attempt at fixing botched merge
25a6591 Merge branch 'master' into develop
a4eebc8 Correctly ensure that charset params always exist
4b38b03 Merge branch 'master' into develop

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

commit 62a0aeb97cce3b5ca26c6c71f2ffe6a4881ce518
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 14:53:14 2012 -0700

    Fix undefined error

 imp/lib/IMP.php                 |    2 +-
 imp/templates/common-header.inc |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/62a0aeb97cce3b5ca26c6c71f2ffe6a4881ce518

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

commit ea4098b3d8a6d3a850e8e0e19407730c8f9e2284
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 14:54:20 2012 -0700

    Cast to string

 imp/lib/Mailbox/List.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit c0534445e08c024e1411d6e6842dcbd605193a0c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:00:19 2012 -0700

    We want to strip access key here, not highlight

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

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

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

commit 70ad1361e25088ff5cf8f2a2b6de9ec792bce3cf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:05:47 2012 -0700

    2nd attempt at fixing botched merge

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

http://git.horde.org/horde-git/-/commit/70ad1361e25088ff5cf8f2a2b6de9ec792bce3cf

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

commit 25a65916995d1b385d6cb9cf05a5b7d099828a88
Merge: ea4098b 70ad136
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:10:51 2012 -0700

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

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

http://git.horde.org/horde-git/-/commit/25a65916995d1b385d6cb9cf05a5b7d099828a88

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

commit a4eebc89ef07c23ff6d94cd291d376fd1ff0c860
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:55:31 2012 -0700

    Correctly ensure that charset params always exist

 turba/lib/Factory/Driver.php |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

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

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

commit 4b38b03606870c8e3946289d3486fe831c90df03
Merge: 25a6591 a4eebc8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:56:19 2012 -0700

    Merge branch 'master' into develop

 turba/lib/Factory/Driver.php |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

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