[commits] Horde branch master updated. 80b7aa3f167787b9577b90b2abd6a2e6c5a3f3f1

[Jan Schneider]

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

from: 0d61b18c55b5b2324874a99956952d3ebd571c29

c4207c7 Fix grep path
80b7aa3 Merge branch 'for_upstream' of git://github.com/sathieu/horde into sathieu-for_upstream

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

commit c4207c7d185b3d7d897f7232e7e7754f14bf2fc3
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Sep 17 17:24:15 2013 +0200

    Fix grep path
    
    grep is in /bin on UNICES (even on Fedora, via a symlink)

 horde/config/hooks.php.dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 80b7aa3f167787b9577b90b2abd6a2e6c5a3f3f1
Merge: 0d61b18 c4207c7
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 18 00:16:32 2013 +0200

    Merge branch 'for_upstream' of git://github.com/sathieu/horde into sathieu-for_upstream

 horde/config/hooks.php.dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/80b7aa3f167787b9577b90b2abd6a2e6c5a3f3f1