[commits] Horde branch master updated. aaa995eeb3a6d3fee25954a5885d0488f5fa7fce

[Michael J. Rubinsky]

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

from: 5a6e8590549bd303f277dddea37e85db26968c1d

ada94bc Simplify.
aaa995e Don't check for conflict if we aren't going to do anything about it.

Summary: http://github.com/horde/horde/compare/5a6e8590549bd303f277dddea37e85db26968c1d...aaa995eeb3a6d3fee25954a5885d0488f5fa7fce

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

commit ada94bc208531f4cf0e84425e3fbabbaff3d721b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri May 23 12:54:34 2014 -0400

    Simplify.

 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php |   64 ++----
 1 files changed, 23 insertions(+), 41 deletions(-)

http://github.com/horde/horde/commit/ada94bc208531f4cf0e84425e3fbabbaff3d721b

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

commit aaa995eeb3a6d3fee25954a5885d0488f5fa7fce
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri May 23 14:55:26 2014 -0400

    Don't check for conflict if we aren't going to do anything about it.

 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/aaa995eeb3a6d3fee25954a5885d0488f5fa7fce