[commits] Horde branch turba_4_2 updated. f4d6fab541ac363b9a83e2f091d40738b7457a85

[Michael J. Rubinsky]

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

from: b0041ed1e6e8da778a5ca81a5295327d0acd6b1a

0eba858 Remove duplicate isAdmin check.
7464168 Call the modifyDevice callback if it's available.
8d5d913 Add Horde_ActiveSync_Device::MULTIPLEX constants.
aa87351 ws
f4d6fab Merge branch 'master' into turba_4_2

Summary: http://github.com/horde/horde/compare/b0041ed1e6e8da778a5ca81a5295327d0acd6b1a...f4d6fab541ac363b9a83e2f091d40738b7457a85

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

commit 0eba858ef5d7c60d6ee8248e0ce1c1c15b1ebff0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 14:42:47 2013 -0500

    Remove duplicate isAdmin check.

 kronolith/lib/Api.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/0eba858ef5d7c60d6ee8248e0ce1c1c15b1ebff0
http://git.horde.org/horde-git/-/commit/0eba858ef5d7c60d6ee8248e0ce1c1c15b1ebff0

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

commit 746416828404aaf0f460969d056984d9d9751211
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 14:50:02 2013 -0500

    Call the modifyDevice callback if it's available.

 framework/ActiveSync/lib/Horde/ActiveSync.php             |   13 +++++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |   18 +++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/746416828404aaf0f460969d056984d9d9751211
http://git.horde.org/horde-git/-/commit/746416828404aaf0f460969d056984d9d9751211

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

commit 8d5d91357a03dd1035c59617138b16ce28606808
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 14:50:32 2013 -0500

    Add Horde_ActiveSync_Device::MULTIPLEX constants.

 framework/ActiveSync/lib/Horde/ActiveSync/Device.php |   25 ++++++++++++-----
 1 files changed, 17 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/8d5d91357a03dd1035c59617138b16ce28606808
http://git.horde.org/horde-git/-/commit/8d5d91357a03dd1035c59617138b16ce28606808

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

commit aa873514c003710a5931ea3828cc058f613fbb1d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 14:50:54 2013 -0500

    ws

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/aa873514c003710a5931ea3828cc058f613fbb1d
http://git.horde.org/horde-git/-/commit/aa873514c003710a5931ea3828cc058f613fbb1d

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

commit f4d6fab541ac363b9a83e2f091d40738b7457a85
Merge: b0041ed aa87351
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 14:53:35 2013 -0500

    Merge branch 'master' into turba_4_2

 framework/ActiveSync/lib/Horde/ActiveSync.php             |   13 +++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php      |   25 +++++++++----
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |   18 +++++++++
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |    2 +-
 kronolith/lib/Api.php                                     |    2 +-
 5 files changed, 50 insertions(+), 10 deletions(-)

http://github.com/horde/horde/commit/f4d6fab541ac363b9a83e2f091d40738b7457a85
http://git.horde.org/horde-git/-/commit/f4d6fab541ac363b9a83e2f091d40738b7457a85