[commits] Horde branch nag_4_2 updated. f0aa1dc7476f9d4d0aaefb00f0ea063320476807

[Michael J. Rubinsky]

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

from: 099a4d353bd7e05c5bf2e1103a72d57b79dd902b

5501c97 [jan] Don't return future tasks from cost objects API.
c58ff5d Support displaying tag columns.
36faf2b [jan] Add show API link.
f0aa1dc Merge branch 'master' into nag_4_2

Summary: http://github.com/horde/horde/compare/099a4d353bd7e05c5bf2e1103a72d57b79dd902b...f0aa1dc7476f9d4d0aaefb00f0ea063320476807

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

commit 5501c97d23c4206a4de228aa7bc18d8a0f87d953
Author: Jan Schneider <jan at horde.org>
Date:   Thu Nov 28 12:18:07 2013 +0100

    [jan] Don't return future tasks from cost objects API.

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

http://github.com/horde/horde/commit/5501c97d23c4206a4de228aa7bc18d8a0f87d953
http://git.horde.org/horde-git/-/commit/5501c97d23c4206a4de228aa7bc18d8a0f87d953

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

commit c58ff5db7a661df5211a796aeab4e728bd4b03dd
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 25 19:59:04 2013 +0100

    Support displaying tag columns.

 turba/lib/Turba.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

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

commit 36faf2b2f6296e7e520c06ec41c466b804c3534f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Nov 29 13:37:48 2013 +0100

    [jan] Add show API link.

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

http://github.com/horde/horde/commit/36faf2b2f6296e7e520c06ec41c466b804c3534f
http://git.horde.org/horde-git/-/commit/36faf2b2f6296e7e520c06ec41c466b804c3534f

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

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