[commits] Horde branch master updated. 3956997dc49724bbb04a449a89b22136a20c77b1

[Michael M Slusarz]

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

from: e761c10333e5b2ed181cb1ac598ba4fb3077963a

e6d31dd [mms] Fix filter drag/drop ordering working in basic view.
3956997 Add Bug #13820 to changelog entries

Summary: http://github.com/horde/horde/compare/e761c10333e5b2ed181cb1ac598ba4fb3077963a...3956997dc49724bbb04a449a89b22136a20c77b1

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

commit e6d31dd5a6b6a47e3cbbb445999c3a624651570e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 22 21:52:58 2015 -0700

    [mms] Fix filter drag/drop ordering working in basic view.
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/docs/CHANGES          |    1 +
 ingo/lib/Basic/Filters.php |    2 ++
 ingo/package.xml           |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)

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

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

commit 3956997dc49724bbb04a449a89b22136a20c77b1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 22 21:55:08 2015 -0700

    Add Bug #13820 to changelog entries
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/docs/CHANGES |    2 +-
 ingo/package.xml  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/3956997dc49724bbb04a449a89b22136a20c77b1