[commits] Horde branch develop updated. 287409f9296940f5d73fbad7681ee6b2d485b944

[Jan Schneider]

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

from: fb3da2a34b23e7d025b320641dbc85348a955cd3

ca10c89 This needs to be an octal value.
d262ca8 [jan] Set Return-Path: in Maildrop vacation driver (rsalmon at mbpgroup.com, Bug #10568).
287409f Merge branch 'master' into develop

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

commit ca10c895d6d690068388ed272b5effc3cf537d63
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sun Nov 13 20:34:23 2011 +0100

    This needs to be an octal value.

 gollem/config/backends.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit d262ca8d14e47986a75e46159704681185414307
Author: Jan Schneider <jan at horde.org>
Date:   Sun Nov 13 22:03:40 2011 +0100

    [jan] Set Return-Path: in Maildrop vacation driver (rsalmon at mbpgroup.com, Bug #10568).

 ingo/docs/CHANGES                   |    4 ++++
 ingo/lib/Script/Maildrop/Recipe.php |    5 +++--
 ingo/package.xml                    |    6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

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

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

commit 287409f9296940f5d73fbad7681ee6b2d485b944
Merge: fb3da2a d262ca8
Author: Jan Schneider <jan at horde.org>
Date:   Sun Nov 13 22:05:01 2011 +0100

    Merge branch 'master' into develop
    
    Conflicts:
    	ingo/package.xml

 gollem/config/backends.php |    2 +-
 ingo/docs/CHANGES          |    4 ++--
 ingo/package.xml           |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/287409f9296940f5d73fbad7681ee6b2d485b944