[commits] Horde branch imp_6_2 updated. 0f66952d02819f2f48506987d27e5d6ebda1b071

[Michael M Slusarz]

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

from: 6be4899f38615d05cc40e2b42c3bb253b1aad3e9

0654001 Remove regex example
a155547 Update help file.
a3fc983 Use session token instead of Horde_Token
0f66952 Merge branch 'ingo_3_2' into imp_6_2

Summary: http://github.com/horde/horde/compare/6be4899f38615d05cc40e2b42c3bb253b1aad3e9...0f66952d02819f2f48506987d27e5d6ebda1b071

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

commit 06540011f5ce1ca3611f79a9182571cbf35aba6e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Nov 4 15:46:20 2013 -0700

    Remove regex example
    
    Our help file is not the place we should be educating users on how to
    formulate regexs.  That is a dangerous idea.

 ingo/locale/en/help.xml |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/06540011f5ce1ca3611f79a9182571cbf35aba6e
http://git.horde.org/horde-git/-/commit/06540011f5ce1ca3611f79a9182571cbf35aba6e

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

commit a15554744adff815a9c20be3ae5ffaca921fd060
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 5 13:50:42 2013 +0100

    Update help file.

 ingo/locale/ca/help.xml |  121 +++++++++++++++-
 ingo/locale/de/help.xml |   13 +-
 ingo/locale/es/help.xml |   96 ++++++++++++-
 ingo/locale/eu/help.xml |   96 ++++++++++++-
 ingo/locale/fi/help.xml |  119 ++++++++++++++-
 ingo/locale/fr/help.xml |  121 +++++++++++++++-
 ingo/locale/hr/help.xml |  367 ++++++++++++++++++++++++++++++-----------------
 ingo/locale/lv/help.xml |  119 ++++++++++++++-
 8 files changed, 876 insertions(+), 176 deletions(-)

http://github.com/horde/horde/commit/a15554744adff815a9c20be3ae5ffaca921fd060
http://git.horde.org/horde-git/-/commit/a15554744adff815a9c20be3ae5ffaca921fd060

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

commit a3fc9836a85ffe542d7120a0fe294e51d9f0418c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 5 16:13:33 2013 -0700

    Use session token instead of Horde_Token

 ingo/lib/Basic/Base.php |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

http://github.com/horde/horde/commit/a3fc9836a85ffe542d7120a0fe294e51d9f0418c
http://git.horde.org/horde-git/-/commit/a3fc9836a85ffe542d7120a0fe294e51d9f0418c

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

commit 0f66952d02819f2f48506987d27e5d6ebda1b071
Merge: 6be4899 a3fc983
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 12 22:34:36 2013 -0700

    Merge branch 'ingo_3_2' into imp_6_2

 ingo/lib/Basic/Base.php |   20 +--
 ingo/locale/ca/help.xml |  121 +++++++++++++++-
 ingo/locale/de/help.xml |   13 +-
 ingo/locale/en/help.xml |    4 +-
 ingo/locale/es/help.xml |   96 ++++++++++++-
 ingo/locale/eu/help.xml |   96 ++++++++++++-
 ingo/locale/fi/help.xml |  119 ++++++++++++++-
 ingo/locale/fr/help.xml |  121 +++++++++++++++-
 ingo/locale/hr/help.xml |  367 ++++++++++++++++++++++++++++++-----------------
 ingo/locale/lv/help.xml |  119 ++++++++++++++-
 10 files changed, 883 insertions(+), 193 deletions(-)

http://github.com/horde/horde/commit/0f66952d02819f2f48506987d27e5d6ebda1b071
http://git.horde.org/horde-git/-/commit/0f66952d02819f2f48506987d27e5d6ebda1b071