[commits] Horde branch master updated. ff329700f5e3521204f256ec38a7558084f02498

[Michael J. Rubinsky]

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

from: 753efc64378f448c0781d159440ff2e1e546ce29

099a4d3 Provide a view url to the desktop notification.
f0aa1dc Merge branch 'master' into nag_4_2
ff32970 Merge branch 'nag_4_2'

Summary: http://github.com/horde/horde/compare/753efc64378f448c0781d159440ff2e1e546ce29...ff329700f5e3521204f256ec38a7558084f02498

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

commit 099a4d353bd7e05c5bf2e1103a72d57b79dd902b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:50:03 2013 -0500

    Provide a view url to the desktop notification.

 nag/lib/Task.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/099a4d353bd7e05c5bf2e1103a72d57b79dd902b
http://git.horde.org/horde-git/-/commit/099a4d353bd7e05c5bf2e1103a72d57b79dd902b

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

commit f0aa1dc7476f9d4d0aaefb00f0ea063320476807
Merge: 099a4d3 36faf2b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:54:38 2013 -0500

    Merge branch 'master' into nag_4_2
    
    Conflicts:
    	nag/docs/CHANGES
    	nag/package.xml

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

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

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

commit ff329700f5e3521204f256ec38a7558084f02498
Merge: 753efc6 f0aa1dc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 17 12:46:10 2013 -0500

    Merge branch 'nag_4_2'
    
    Fixes some missing commits.
    
    Conflicts:
    	nag/package.xml

 nag/lib/Task.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

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