[commits] Horde branch master updated. 502d80a8dfb0898bccf45c3cde122f9884762640

[Jan Schneider]

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

from: ee59badf9c55a570a75be9df20b29e24effc8335

dab53b6 Fix duplicate search form (Bug #13528).
8a26af0 BFN
502d80a Fix query if __owner is not mapped.

Summary: http://github.com/horde/horde/compare/ee59badf9c55a570a75be9df20b29e24effc8335...502d80a8dfb0898bccf45c3cde122f9884762640

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

commit dab53b6b2ae2ad56c48e8a6f7ff5a1b2c7697dde
Author: Jan Schneider <jan at horde.org>
Date:   Fri Aug 29 12:33:37 2014 +0200

    Fix duplicate search form (Bug #13528).

 turba/search.php                          |    3 +--
 turba/templates/search/duplicate.html.php |    2 --
 2 files changed, 1 insertions(+), 4 deletions(-)

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

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

commit 8a26af0964d51de294608e4ee6586cbfb8a7db19
Author: Jan Schneider <jan at horde.org>
Date:   Fri Aug 29 12:18:22 2014 +0200

    BFN
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml
    	nag/docs/CHANGES
    	nag/package.xml

 kronolith/package.xml |   16 ++++++++++++++++
 nag/docs/CHANGES      |    5 +++--
 nag/package.xml       |   13 +++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/8a26af0964d51de294608e4ee6586cbfb8a7db19

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

commit 502d80a8dfb0898bccf45c3cde122f9884762640
Author: Jan Schneider <jan at horde.org>
Date:   Fri Aug 29 13:59:18 2014 +0200

    Fix query if __owner is not mapped.

 turba/lib/Driver/Sql.php |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/502d80a8dfb0898bccf45c3cde122f9884762640