[commits] Horde branch master updated. e7805d0746c58221d3ed39da64e48c012d13177b

[Michael J. Rubinsky]

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

from: 2a084b367086516ad5b0cae404ecb440460921d2

4a7f5c9 Fix canceling remote wipe of EAS client from user prefs.
e7805d0 BFN

Summary: http://github.com/horde/horde/compare/2a084b367086516ad5b0cae404ecb440460921d2...e7805d0746c58221d3ed39da64e48c012d13177b

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

commit 4a7f5c9922fbaab1fdb3c12b9242697662d08f54
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 20 17:57:27 2014 -0400

    Fix canceling remote wipe of EAS client from user prefs.

 horde/lib/Prefs/Special/Activesync.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/4a7f5c9922fbaab1fdb3c12b9242697662d08f54

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

commit e7805d0746c58221d3ed39da64e48c012d13177b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 20 17:58:39 2014 -0400

    BFN
    
    Conflicts:
    	horde/docs/CHANGES
    	horde/package.xml

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

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