[commits] Horde branch master updated. 56b07e1875efb7e03418ec2f9ca34466a30727b3

[Jan Schneider]

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

from: 997df1522b272355fb8a086516d2ef22dc0f73ff

123bb88 Add Croatian help file.
f025554 Fix merging Horde changes to Git.
4f0dce4 BFN
56b07e1 MFB

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

commit 123bb8818add89d4a54750af95a3f9ff0632db6d
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 29 13:25:03 2009 +0100

    Add Croatian help file.

 horde/admin/locale/hr_HR/help.xml |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 horde/admin/locale/hr_HR/help.xml

http://git.horde.org/co.php/horde/admin/locale/hr_HR/help.xml?rt=horde-git&r=123bb8818add89d4a54750af95a3f9ff0632db6d

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

commit f0255540010ff99e282cb371a7bb5fd59e05614c
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 30 15:24:48 2009 +0100

    Fix merging Horde changes to Git.

 framework/devtools/horde-merge.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/devtools/horde-merge.php?rt=horde-git&r1=43d7cc98330fca9a9d8b14564cb6d430c9b5083b&r2=f0255540010ff99e282cb371a7bb5fd59e05614c

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

commit 4f0dce4e23f9f88c3546255e459f213a0276e291
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 30 15:25:28 2009 +0100

    BFN

 horde/docs/CHANGES |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/horde/docs/CHANGES?rt=horde-git&r1=44794778d1e148b988fe57a75b3ef203883fa05f&r2=4f0dce4e23f9f88c3546255e459f213a0276e291

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

commit 56b07e1875efb7e03418ec2f9ca34466a30727b3
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 30 15:25:54 2009 +0100

    MFB

 framework/Rpc/test/rpc-test.php |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/framework/Rpc/test/rpc-test.php?rt=horde-git&r1=240056800c5644feefb18a1dcdcff29fe83552ae&r2=56b07e1875efb7e03418ec2f9ca34466a30727b3