[commits] Horde branch develop updated. 9fbec16a44f6853777a564223ae1f08915e873ce

[Jan Schneider]

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

from: 87fc4d2bd540cf0de075fc5d4df2e67c5fef3652

7e2d841 Discourage users from installing into a separate PEAR.
456d107 [jan] Fix recursive listFolder() on base directory.
e261dbd [jan] Fix several issues with quota calculation.
9fbec16 Merge branch 'master' into develop

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

commit 7e2d8417fa1759f0e8884373fa32b6c3b5e87368
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 2 18:17:15 2012 +0100

    Discourage users from installing into a separate PEAR.

 bundles/groupware/docs/INSTALL |    4 ++++
 bundles/webmail/docs/INSTALL   |    4 ++++
 horde/docs/INSTALL             |    4 ++++
 3 files changed, 12 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/7e2d8417fa1759f0e8884373fa32b6c3b5e87368

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

commit 456d107923ea754c7cd191f520149080274f2ba9
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 2 18:38:30 2012 +0100

    [jan] Fix recursive listFolder() on base directory.
    
    Conflicts:
    
    	framework/Vfs/package.xml

 framework/Vfs/lib/Horde/Vfs/Base.php |    5 ++++-
 framework/Vfs/package.xml            |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/456d107923ea754c7cd191f520149080274f2ba9

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

commit e261dbd1eaacee9243d5230d04b9da19547dfec1
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 2 18:40:37 2012 +0100

    [jan] Fix several issues with quota calculation.
    
    Conflicts:
    
    	framework/Vfs/lib/Horde/Vfs/Sql.php

 framework/Vfs/lib/Horde/Vfs/Base.php |   17 ++++++++++-------
 framework/Vfs/lib/Horde/Vfs/Sql.php  |   20 ++++++++++++++++----
 framework/Vfs/package.xml            |    2 ++
 3 files changed, 28 insertions(+), 11 deletions(-)

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

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

commit 9fbec16a44f6853777a564223ae1f08915e873ce
Merge: 87fc4d2 e261dbd
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 2 18:59:46 2012 +0100

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Vfs/package.xml

 bundles/groupware/docs/INSTALL |    4 ++++
 bundles/webmail/docs/INSTALL   |    4 ++++
 framework/Vfs/package.xml      |   19 +++++++++++++++----
 horde/docs/INSTALL             |    4 ++++
 4 files changed, 27 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/9fbec16a44f6853777a564223ae1f08915e873ce