[commits] Horde branch master updated. 1238e035ca512ab9e57f4113aac7930a75e55699

[Jan Schneider]

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

from: 7ded9faece78aa17ea6fe67c3e3a4ba33ad69f14

cc2fe01 Fix parse error.
5693d0e Error silencing was removed.
1238e03 Revert "Move time_format pref to Horde"

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

commit cc2fe01dd1a02bd192e5e385c6c0d72ddc8953a0
Author: Jan Schneider <jan at horde.org>
Date:   Sun Oct 3 20:48:30 2010 +0200

    Fix parse error.

 kronolith/lib/Event/Holidays.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/kronolith/lib/Event/Holidays.php?rt=horde-git&r1=e60da622060274282dd92c2d41c4c0dce4724dd6&r2=cc2fe01dd1a02bd192e5e385c6c0d72ddc8953a0

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

commit 5693d0e6897146223c3da6e44ac5fc0ac805ae5d
Author: Jan Schneider <jan at horde.org>
Date:   Sun Oct 3 20:49:42 2010 +0200

    Error silencing was removed.

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

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=e60da622060274282dd92c2d41c4c0dce4724dd6&r2=5693d0e6897146223c3da6e44ac5fc0ac805ae5d

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

commit 1238e035ca512ab9e57f4113aac7930a75e55699
Author: Jan Schneider <jan at horde.org>
Date:   Sun Oct 3 20:57:13 2010 +0200

    Revert "Move time_format pref to Horde"
    
    This reverts commit ad1c9fcec705761a78f9b2b6fcea30803c10dc00.
    
    Revert the changes to Kronolith which is using a completely different
    time format preference.

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

http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=e60da622060274282dd92c2d41c4c0dce4724dd6&r2=1238e035ca512ab9e57f4113aac7930a75e55699