[commits] Horde branch develop updated. 883212011068546170ef48ee6c04c8d7759268fc

[Michael M Slusarz]

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

from: 04aef986a4fc321bbd9806f23b3a32e7bde857ed

acc5bb9 Ignore errors in parsing time from the getTransistions() call.
8832120 Merge branch 'master' into develop

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

commit acc5bb9eb64b0c43ab45ee5c2b7bfadb7d05c346
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Nov 16 02:13:02 2011 -0500

    Ignore errors in parsing time from the getTransistions() call.
    
    Looks like PHP returns really weird values for the first transition for
    some tzs. (Hopefully) fixes Bug: 10760

 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php |    6 +++++-
 framework/ActiveSync/package.xml                       |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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

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

commit 883212011068546170ef48ee6c04c8d7759268fc
Merge: 04aef98 acc5bb9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 16 01:10:41 2011 -0700

    Merge branch 'master' into develop


http://git.horde.org/horde-git/-/commit/883212011068546170ef48ee6c04c8d7759268fc