[commits] Horde branch master updated. 43277162f61c1ee89273e6b187002e639eb0e04f

[Michael Rubinsky]

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

from: 7756b6b041a421aa19e6dfec861b7b1f0461b06f

4327716 fix parse error

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

commit 43277162f61c1ee89273e6b187002e639eb0e04f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 20 11:25:36 2010 -0400

    fix parse error

 turba/merge.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/turba/merge.php?rt=horde-git&r1=b8614426ad255d7b9f0090a9df6dfd758eb7cca6&r2=43277162f61c1ee89273e6b187002e639eb0e04f