[commits] Horde branch develop updated. 9417ce93f036dc0509ccd65d02aca1a560f930f5

[Michael J. Rubinsky]

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

from: 5a3e486c783be7b426a81bd484f56aed35d0ea7c

a06bef8 Ensure incoming birthday/anniversary dates are converted to local tz.
a945350 Ensure these values are always arrays
763a99c fix phpdoc, remove erroneous typehint
581e336 Catch case where $offset has DST info, but timezone we are checking does not
c455d13 When reloading preferences after authentication, app may not yet be pushed onto stack so explicitly identify the app.
c16b466 BFN
9417ce9 Merge branch 'master' into develop

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

commit a06bef8ec8edd3d261f6d798d67c699434a04378
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 14:11:02 2012 -0400

    Ensure incoming birthday/anniversary dates are converted to local tz.

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

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

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

commit a945350f0d654e72127e2435f58b81bff4b5a027
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 16:16:25 2012 -0400

    Ensure these values are always arrays

 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 763a99c7e145f4a9e71cf8dead1d85212251948a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 16:16:43 2012 -0400

    fix phpdoc, remove erroneous typehint

 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/763a99c7e145f4a9e71cf8dead1d85212251948a

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

commit 581e336e0f5700e3994a21b6d0c6121633637c09
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 16:17:02 2012 -0400

    Catch case where $offset has DST info, but timezone we are checking does not

 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/581e336e0f5700e3994a21b6d0c6121633637c09

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

commit c455d135839fae2768cf72a2453fb104d8223911
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 12 14:41:00 2012 -0600

    When reloading preferences after authentication, app may not yet be pushed onto stack so explicitly identify the app.

 framework/Core/lib/Horde/Registry.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit c16b466e0c3455f095beaf15256c6bf907b890bc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 16:44:42 2012 -0400

    BFN

 framework/ActiveSync/package.xml |    4 ++--
 kronolith/docs/CHANGES           |    2 ++
 kronolith/package.xml            |    2 ++
 turba/docs/CHANGES               |    2 ++
 turba/package.xml                |    4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

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

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

commit 9417ce93f036dc0509ccd65d02aca1a560f930f5
Merge: 5a3e486 c16b466
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 12 16:56:05 2012 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php
    	kronolith/package.xml
    	turba/package.xml

 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php |   13 ++++++---
 framework/ActiveSync/package.xml                       |    4 +-
 framework/Core/lib/Horde/Registry.php                  |    2 +-
 kronolith/docs/CHANGES                                 |    2 +
 kronolith/package.xml                                  |    1 +
 turba/docs/CHANGES                                     |    2 +
 turba/lib/Driver.php                                   |    2 +
 turba/package.xml                                      |   22 ++++++++++++---
 8 files changed, 35 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/9417ce93f036dc0509ccd65d02aca1a560f930f5