[commits] Horde branch master updated. 8868edcf9fd18942017bf722bdbed788ad32b231

[Jan Schneider]

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

from: 0d2fb0dfe1dcaa74292c52c859e82619683ed993

dc05229 [jan] Fix sorting by owner if displaying external task sources.
df2e4d1 Simplify
8868edc [jan] Fix changing sort direction.

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

commit dc05229ad64519a93d095d220b5ce4df138e6b44
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 30 18:46:52 2012 +0200

    [jan] Fix sorting by owner if displaying external task sources.
    
    Conflicts:
    
    	nag/package.xml

 nag/docs/CHANGES |    1 +
 nag/lib/Nag.php  |   49 +++++++++++++++++++------------------------------
 nag/package.xml  |    1 +
 3 files changed, 21 insertions(+), 30 deletions(-)

http://git.horde.org/horde-git/-/commit/dc05229ad64519a93d095d220b5ce4df138e6b44

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

commit df2e4d16ff5945e75310d094ab8f2df56de6afa4
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 30 18:51:06 2012 +0200

    Simplify
    
    Conflicts:
    
    	nag/lib/Nag.php

 nag/lib/Nag.php |   45 +++++----------------------------------------
 1 files changed, 5 insertions(+), 40 deletions(-)

http://git.horde.org/horde-git/-/commit/df2e4d16ff5945e75310d094ab8f2df56de6afa4

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

commit 8868edcf9fd18942017bf722bdbed788ad32b231
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 30 19:08:10 2012 +0200

    [jan] Fix changing sort direction.
    
    Conflicts:
    
    	nag/package.xml
    	nag/templates/list.html.php
    	nag/templates/list/task_headers.inc

 nag/docs/CHANGES                    |    1 +
 nag/package.xml                     |    1 +
 nag/templates/list.html.php         |   25 +++++++++++++++++++++----
 nag/templates/list/task_headers.inc |   16 ++++++++--------
 4 files changed, 31 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/8868edcf9fd18942017bf722bdbed788ad32b231