[commits] Horde branch master updated. b677080b2c201835f1cd14f98b83004b921a15b4

[Jan Schneider]

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

from: dc2f485b2f7dcbf95c362b97cc61f5e88068c299

45f4e6c Catch missing parent task during import.
3d51853 Fix header
4bfc176 Fix comment.
f4bc142 Require Horde_Exception.
b677080 Don't delete exceptions and completions when saving.

Summary: http://github.com/horde/horde/compare/dc2f485b2f7dcbf95c362b97cc61f5e88068c299...b677080b2c201835f1cd14f98b83004b921a15b4

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

commit 45f4e6ce2a478335286ff796c8299191fca6bc60
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 27 16:30:30 2015 +0200

    Catch missing parent task during import.
    
    Conflicts:
    	nag/lib/Task.php

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

http://github.com/horde/horde/commit/45f4e6ce2a478335286ff796c8299191fca6bc60

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

commit 3d5185300102bed6978254cc2970a03639cc96ae
Author: Jan Schneider <jan at horde.org>
Date:   Fri May 29 15:46:34 2015 +0200

    Fix header

 framework/ManageSieve/doc/Horde/ManageSieve/UPGRADING |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/3d5185300102bed6978254cc2970a03639cc96ae

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

commit 4bfc176886ebac6871531d469f45c84e9de1f94e
Author: Jan Schneider <jan at horde.org>
Date:   Fri May 29 15:47:32 2015 +0200

    Fix comment.

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

http://github.com/horde/horde/commit/4bfc176886ebac6871531d469f45c84e9de1f94e

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

commit f4bc1427cf3ab3042fb2ce652d2e5f6e49ded1d2
Author: Jan Schneider <jan at horde.org>
Date:   Fri May 29 15:49:59 2015 +0200

    Require Horde_Exception.

 framework/ManageSieve/package.xml |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

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

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

commit b677080b2c201835f1cd14f98b83004b921a15b4
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 1 17:24:00 2015 +0200

    Don't delete exceptions and completions when saving.

 kronolith/js/kronolith.js            |    4 ++++
 kronolith/lib/Event.php              |   19 +++++++++++++------
 kronolith/templates/dynamic/edit.inc |    1 +
 kronolith/templates/dynamic/task.inc |    2 ++
 nag/lib/Form/Type/NagRecurrence.php  |   16 ++++++++++------
 nag/lib/Task.php                     |   18 +++++++++---------
 nag/lib/Ui/VarRenderer/Nag.php       |   16 ++++++++++++++++
 7 files changed, 55 insertions(+), 21 deletions(-)

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