[commits] Horde branch master updated. 5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a

[Jan Schneider]

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

from: c0140c3935107af601819bb135bbff7228db7758

bbed8d4 Only show branch list if multiple branches exist.
5e7c4e3 Fix generating logs for merge commits.

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

commit bbed8d483eb9e97d24a27fd2a2d14ed1abcd7903
Author: Jan Schneider <jan at horde.org>
Date:   Wed Mar 28 21:24:28 2012 +0200

    Only show branch list if multiple branches exist.

 chora/browsefile.php           |    9 ++-------
 chora/templates/log/header.inc |    7 +++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

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

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

commit 5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a
Author: Jan Schneider <jan at horde.org>
Date:   Wed Mar 28 21:47:39 2012 +0200

    Fix generating logs for merge commits.

 framework/Vcs/lib/Horde/Vcs/Log/Git.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a