[commits] Horde branch imp_6_1 updated. a1912abd11d5ad196b9d51428d775786af8d78f8

[Michael J. Rubinsky]

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

from: 75b92fcb5117c8745f6cfe45b5344cd28624022d

9e83070 phpdoc
8d3d85a Fix bad merge.
a1912ab changes

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

commit 9e83070ae376b67f2cb073d3f3b641aa5d698aa0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:25:19 2013 -0400

    phpdoc

 imp/lib/Api.php     |    6 +++---
 imp/lib/Maillog.php |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/9e83070ae376b67f2cb073d3f3b641aa5d698aa0

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

commit 8d3d85a312c97e6c75ff3833c6baf7bd9bda1546
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:48:01 2013 -0400

    Fix bad merge.

 imp/package.xml |   73 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 64 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/8d3d85a312c97e6c75ff3833c6baf7bd9bda1546

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

commit a1912abd11d5ad196b9d51428d775786af8d78f8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:48:14 2013 -0400

    changes

 imp/docs/CHANGES |    1 +
 imp/package.xml  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

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