[commits] Horde branch develop updated. a5211556dda247baeb80e5c043032fb7c8f5bae7

[Michael J. Rubinsky]

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

from: cf1d2bfc262b03b94f0e257100662320993ee4a6

38592a5 Bug #10996: encode javascript tooltip
1a100bd doc c/p and typo
dcb737c Fix broken Group searching on postgresql
26875e1 Need to include the __members field by default also.
601f261 Need to include the __members field by default also.
a521155 Merge branch 'master' into develop

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

commit 38592a5a1b5632b790d323b96f61bf07155f64e0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 23:04:08 2012 -0700

    Bug #10996: encode javascript tooltip

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

http://git.horde.org/horde-git/-/commit/38592a5a1b5632b790d323b96f61bf07155f64e0

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

commit 1a100bdc719d625f85faad424462068521fb2b09
Author: Ralf Lang <rlang at linux-il16.fritz.box>
Date:   Thu Feb 16 08:36:51 2012 +0100

    doc c/p and typo

 kronolith/lib/Calendar/Resource.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/1a100bdc719d625f85faad424462068521fb2b09

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

commit dcb737ced5b5280605a200864ffefd4e250c39b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 16 16:05:12 2012 -0700

    Fix broken Group searching on postgresql
    
    'name' is a reserved keyword in Postgresql

 turba/lib/Api.php |   70 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 39 insertions(+), 31 deletions(-)

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

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

commit 26875e1907664f85e072437d2310073bd28dec20
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Feb 17 11:23:05 2012 -0500

    Need to include the __members field by default also.
    
    Otherwise, contact lists will always be empty. Bug: 10961

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

http://git.horde.org/horde-git/-/commit/26875e1907664f85e072437d2310073bd28dec20

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

commit 601f261b920d48a19ac462deab3887e7e57c6062
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Feb 17 11:29:28 2012 -0500

    Need to include the __members field by default also.
    
    Otherwise, contact lists will always be empty. Bug: 10961

 turba/docs/CHANGES |    2 ++
 turba/package.xml  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/601f261b920d48a19ac462deab3887e7e57c6062

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

commit a5211556dda247baeb80e5c043032fb7c8f5bae7
Merge: cf1d2bf 601f261
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Feb 17 11:36:47 2012 -0500

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/lib/Calendar/Resource.php

 imp/mailbox.php                     |    2 +-
 kronolith/lib/Calendar/Resource.php |    3 +-
 turba/docs/CHANGES                  |    2 +
 turba/lib/Api.php                   |   70 +++++++++++++++++++---------------
 turba/package.xml                   |    2 +
 5 files changed, 46 insertions(+), 33 deletions(-)

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