[commits] Horde branch prototype-1.7 updated. 29625e5a31cd167cfc5f211e1debeeb9d0b65b90

[Jan Schneider]

The branch "prototype-1.7" has been updated.
The following is a summary of the commits.

from: 47eba91fe13f787a1ff3bbad6a4435d7c3d386bb

1b53372 Use Object.toJSON().
29625e5 Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7

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

commit 1b5337226a157dd74310fa56f124a4ffa1795997
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 16:10:58 2010 +0200

    Use Object.toJSON().

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

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=c9a16841e90729870e0417851860df1c28431524&r2=1b5337226a157dd74310fa56f124a4ffa1795997

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

commit 29625e5a31cd167cfc5f211e1debeeb9d0b65b90
Merge: 1b53372 47eba91
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 16:13:04 2010 +0200

    Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7