[commits] Horde branch master updated. 9976ea909497829e0ede16266fcc1d227579b26e

[Michael J. Rubinsky]

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

from: ff329700f5e3521204f256ec38a7558084f02498

45bb683 Include the view url in the alarm notification.
ce84b68 Revert "Include the view url in the alarm notification."
29b186d Revert "Revert "Include the view url in the alarm notification.""
b39469e Merge branch 'master' into kronolith_4_2
9976ea9 Merge branch 'kronolith_4_2'

Summary: http://github.com/horde/horde/compare/ff329700f5e3521204f256ec38a7558084f02498...9976ea909497829e0ede16266fcc1d227579b26e

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

commit 45bb68381386b9e05639ec2f821170bbda485bde
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 13:35:46 2013 -0500

    Include the view url in the alarm notification.

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

http://github.com/horde/horde/commit/45bb68381386b9e05639ec2f821170bbda485bde
http://git.horde.org/horde-git/-/commit/45bb68381386b9e05639ec2f821170bbda485bde

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

commit ce84b681d810d44ef9879bd69a9ab4e391e4875e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 15:00:22 2013 -0500

    Revert "Include the view url in the alarm notification."
    
    This reverts commit 45bb68381386b9e05639ec2f821170bbda485bde.

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

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

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

commit 29b186d0c04e9b2d123f0fd0f65db4825ef83822
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:32:54 2013 -0500

    Revert "Revert "Include the view url in the alarm notification.""
    
    This reverts commit ce84b681d810d44ef9879bd69a9ab4e391e4875e.

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

http://github.com/horde/horde/commit/29b186d0c04e9b2d123f0fd0f65db4825ef83822
http://git.horde.org/horde-git/-/commit/29b186d0c04e9b2d123f0fd0f65db4825ef83822

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

commit b39469e90b0392c92104ad0f42e3b9a210151f3e
Merge: 29b186d 36faf2b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:52:45 2013 -0500

    Merge branch 'master' into kronolith_4_2

 nag/docs/CHANGES    |    1 +
 nag/lib/Api.php     |    6 ++++--
 nag/package.xml     |    4 ++--
 turba/lib/Turba.php |    3 ++-
 whups/docs/CHANGES  |    1 +
 whups/lib/Api.php   |    9 +++++++++
 whups/package.xml   |    4 ++--
 7 files changed, 21 insertions(+), 7 deletions(-)

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

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

commit 9976ea909497829e0ede16266fcc1d227579b26e
Merge: ff32970 b39469e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 17 12:47:47 2013 -0500

    Merge branch 'kronolith_4_2'

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

http://github.com/horde/horde/commit/9976ea909497829e0ede16266fcc1d227579b26e
http://git.horde.org/horde-git/-/commit/9976ea909497829e0ede16266fcc1d227579b26e