[commits] Horde branch master updated. 9fc014fd1658b05b2634e89c11ba1079eddc6b30

[Jan Schneider]

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

from: 67720bf52049284f4b697aea506a86766bfdc6dd

f8c60c2 Avoid warning if already defined.
03813ed Missed adding a json_decode().
9fc014f Don't target the frameset when redirecting.

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

commit f8c60c2c4e7bbe3ed59b67649da2ac67e4d8f0c4
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 12 16:34:09 2010 +0200

    Avoid warning if already defined.

 framework/bin/install_dev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/bin/install_dev?rt=horde-git&r1=67720bf52049284f4b697aea506a86766bfdc6dd&r2=f8c60c2c4e7bbe3ed59b67649da2ac67e4d8f0c4

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

commit 03813edd5fe506288dc4a64a79260b2bec6a7950
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 12 16:36:50 2010 +0200

    Missed adding a json_decode().

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

http://git.horde.org/diff.php/turba/lib/Turba.php?rt=horde-git&r1=60c4f81fda312da901de3918f78b369c03914dcc&r2=03813edd5fe506288dc4a64a79260b2bec6a7950

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

commit 9fc014fd1658b05b2634e89c11ba1079eddc6b30
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 12 16:38:21 2010 +0200

    Don't target the frameset when redirecting.

 kronolith/js/kronolith.js |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=3eaa7179c450e1a30d13bbedf34cc46f2fbda6da&r2=9fc014fd1658b05b2634e89c11ba1079eddc6b30