[commits] Horde branch master updated. 349d34eefdee16e678b3ef35b552734ada71a719

[Jan Schneider]

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

from: ed115a23b6d244a1247ed735cec20f9dd8066e44

bfae2e3 The default quotaroot should be the base directory, not the root directory.
349d34e [jan] Fix calculating folder sizes with similar folder names in SQL driver.

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

commit bfae2e380f712389292eab4529235a559484e290
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 1 19:24:29 2012 +0100

    The default quotaroot should be the base directory, not the root directory.

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

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

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

commit 349d34eefdee16e678b3ef35b552734ada71a719
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 1 19:25:53 2012 +0100

    [jan] Fix calculating folder sizes with similar folder names in SQL driver.
    
    Conflicts:
    
    	framework/Vfs/package.xml

 framework/Vfs/lib/Horde/Vfs/Sql.php |   15 +++++++++------
 framework/Vfs/package.xml           |    4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/349d34eefdee16e678b3ef35b552734ada71a719