[commits] Horde branch horde_5_1 updated. 36cb70f6d2e8b48fde556ce74f4b97625131c9e2

[Michael J. Rubinsky]

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

from: b6d22628bc5214fe60e8926c213d86f04a9eb019

1dc2ef7 Finish implementation of EAS 14+ SENDMAIL/SMARTREPLY/SMARTFORWARD requests.
36cb70f Fix bad merge.

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

commit 1dc2ef77599a97a23ab53a969dca1cd876b0a76a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Mar 15 11:47:49 2013 -0400

    Finish implementation of EAS 14+ SENDMAIL/SMARTREPLY/SMARTFORWARD requests.
    
    Conflicts:
    	framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php

 .../ActiveSync/lib/Horde/ActiveSync/Request/SmartForward.php      |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SmartReply.php  |    6 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   49 ++++-
 3 files changed, 50 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/1dc2ef77599a97a23ab53a969dca1cd876b0a76a

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

commit 36cb70f6d2e8b48fde556ce74f4b97625131c9e2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Mar 15 12:08:50 2013 -0400

    Fix bad merge.

 .../ActiveSync/lib/Horde/ActiveSync/Request/SmartForward.php      |    6 +----
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SmartReply.php  |    6 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/36cb70f6d2e8b48fde556ce74f4b97625131c9e2