[commits] Horde branch develop updated. c137bc2a1690e21ecfd9f4905fe8cbc54573ac3d

[Michael M Slusarz]

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

from: 1390bd940cd0ff631bd2a42af941bf0cff9abec7

d542aed Fix typo preventing advanced search
782dce7 Bug #11102: Make sure we are doing an integer conversion on boolean values
ef16353 Bug #11101: Correct conversion to address list string
c137bc2 Merge branch 'master' into develop

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

commit d542aedcc0cfae8db867c1a20283424563994831
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 24 08:56:06 2012 -0600

    Fix typo preventing advanced search

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

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

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

commit 782dce76a3726b8da866d9358c71ec76d2308817
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 24 09:05:50 2012 -0600

    Bug #11102: Make sure we are doing an integer conversion on boolean values

 imp/lib/Search/Element/Attachment.php    |    2 +-
 imp/lib/Search/Element/Autogenerated.php |    2 +-
 imp/lib/Search/Element/Bulk.php          |    2 +-
 imp/lib/Search/Element/Contacts.php      |    2 +-
 imp/lib/Search/Element/Flag.php          |    2 +-
 imp/lib/Search/Element/Header.php        |    2 +-
 imp/lib/Search/Element/Mailinglist.php   |    2 +-
 imp/lib/Search/Element/Personal.php      |    2 +-
 imp/lib/Search/Element/Recipient.php     |    2 +-
 imp/lib/Search/Element/Size.php          |    2 +-
 imp/lib/Search/Element/Text.php          |    4 ++--
 imp/lib/Search/Element/Within.php        |    2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/782dce76a3726b8da866d9358c71ec76d2308817

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

commit ef16353e85a9ae6e53fee44ed5202a09c72f4317
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 24 09:10:31 2012 -0600

    Bug #11101: Correct conversion to address list string

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

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

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

commit c137bc2a1690e21ecfd9f4905fe8cbc54573ac3d
Merge: d542aed ef16353
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 24 09:12:38 2012 -0600

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

 imp/lib/Search/Element/Attachment.php    |    2 +-
 imp/lib/Search/Element/Autogenerated.php |    2 +-
 imp/lib/Search/Element/Bulk.php          |    2 +-
 imp/lib/Search/Element/Contacts.php      |    2 +-
 imp/lib/Search/Element/Flag.php          |    2 +-
 imp/lib/Search/Element/Header.php        |    2 +-
 imp/lib/Search/Element/Mailinglist.php   |    2 +-
 imp/lib/Search/Element/Personal.php      |    2 +-
 imp/lib/Search/Element/Recipient.php     |    2 +-
 imp/lib/Search/Element/Size.php          |    2 +-
 imp/lib/Search/Element/Text.php          |    4 ++--
 imp/lib/Search/Element/Within.php        |    2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

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