[commits] Horde branch master updated. e3c6d57fb64bba712e60b964462e6786cbe67c67

[Michael J. Rubinsky]

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

from: 69cea2531f12465603266517dbab4545f30a0347

d866a31 Bug: 13336 Fix removing device state when multiple accounts exist on the same device.
e3c6d57 Bug: 13657  Fix user activesync client actions.

Summary: http://github.com/horde/horde/compare/69cea2531f12465603266517dbab4545f30a0347...e3c6d57fb64bba712e60b964462e6786cbe67c67

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

commit d866a3129f1933f7a74dd1551349288fd4c8b0f9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 10 13:57:45 2014 -0400

    Bug: 13336 Fix removing device state when multiple accounts exist on the same device.
    
    Conflicts:
    	horde/admin/activesync.php

 horde/admin/activesync.php                       |    9 +++++++--
 horde/templates/activesync/device_table.html.php |   10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

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

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

commit e3c6d57fb64bba712e60b964462e6786cbe67c67
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 9 13:57:51 2014 -0500

    Bug: 13657  Fix user activesync client actions.

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

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