[commits] Horde branch master updated. 4d462c22742104c73ad9eb5e522a9fff530e5893

[Michael J. Rubinsky]

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

from: f1a9c26a2e5e8b5edf4216f6278426593e4dda69

ea31f9f Bug: 11745 Remove duplicate, erroneous assignment from bad merge.
4d462c2 BFN

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

commit ea31f9fb010d093c07b00c39f85533293f792cea
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 3 10:20:43 2012 -0500

    Bug: 11745 Remove duplicate, erroneous assignment from bad merge.

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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

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

commit 4d462c22742104c73ad9eb5e522a9fff530e5893
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 3 10:25:13 2012 -0500

    BFN

 framework/ActiveSync/package.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/4d462c22742104c73ad9eb5e522a9fff530e5893