[commits] Horde branch master updated. 2cf53565d5283a8d9d4b08a512d269d5931f8430

[Jan Schneider]

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

from: c719f9c8c68c10e5c787e965f7e301f76b6842be

fb11ec5 German translation: Fix small grammar glitch
079af23 Save horde alarms methods in Kolab event XML like we do for nag
a4cbf5f Add form ID.
2cf5356 [jan] Fix generating cache key for generated URLs (remi at famillecollet.com, Bug #11894).

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

commit fb11ec548736a2fee4abffb396dce4b35520c430
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Thu Dec 13 17:40:48 2012 +0100

    German translation: Fix small grammar glitch
    
    Bug: 11881
    Signed-off-by: Thomas Jarosch <thomas.jarosch at intra2net.com>
    Signed-off-by: Jan Schneider <jan at horde.org>

 turba/locale/de/LC_MESSAGES/turba.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 079af2301bbf8adc85d139eb5ea08f6e268aac42
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Thu Dec 13 17:23:34 2012 +0100

    Save horde alarms methods in Kolab event XML like we do for nag
    
    Bug: 11880
    Signed-off-by: Thomas Jarosch <thomas.jarosch at intra2net.com>
    Signed-off-by: Jan Schneider <jan at horde.org>

 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php |    1 +
 kronolith/docs/CHANGES                                      |    2 ++
 kronolith/lib/Event/Kolab.php                               |    7 +++++++
 kronolith/package.xml                                       |    2 ++
 4 files changed, 12 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/079af2301bbf8adc85d139eb5ea08f6e268aac42

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

commit a4cbf5f4f23b56d9e7017947ce31079dd2d3b735
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 8 00:13:24 2013 +0100

    Add form ID.
    
    Fixes notifications (Bug #11892).

 passwd/templates/index.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 2cf53565d5283a8d9d4b08a512d269d5931f8430
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 8 00:21:20 2013 +0100

    [jan] Fix generating cache key for generated URLs (remi at famillecollet.com, Bug #11894).

 framework/Routes/lib/Horde/Routes/Mapper.php |    2 +-
 framework/Routes/package.xml                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/2cf53565d5283a8d9d4b08a512d269d5931f8430