[commits] Horde branch master updated. 2f32d252aa09310bbb2e7f0b6c8b1537160cc4f9

[Michael M Slusarz]

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

from: 2df6e112be4a10ca48e2748790fc962b12b26cc2

26aa243 add option to specify the redis database index to connect to
83cbb24 Update conf.xml
867c571 Merge branch 'redis_config' of git://github.com/BigMichi1/horde into BigMichi1-redis_config
2f32d25 Merge branch 'BigMichi1-redis_config'

Summary: http://github.com/horde/horde/compare/2df6e112be4a10ca48e2748790fc962b12b26cc2...2f32d252aa09310bbb2e7f0b6c8b1537160cc4f9

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

commit 26aa2434c42f8b88679a97b1660c19682dfcae3a
Author: Michael Cramer <michael at bigmichi1.de>
Date:   Thu Jan 8 08:58:00 2015 +0100

    add option to specify the redis database index to connect to

 framework/Core/lib/Horde/Core/Factory/HashTable.php |    4 +++-
 horde/config/conf.xml                               |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/26aa2434c42f8b88679a97b1660c19682dfcae3a

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

commit 83cbb24144766d1dd39ec25589b5030d0ccbe4b2
Author: Michael Cramer <michael at bigmichi1.de>
Date:   Thu Jan 8 11:18:32 2015 +0100

    Update conf.xml
    
    change configinteger to configstring

 horde/config/conf.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/83cbb24144766d1dd39ec25589b5030d0ccbe4b2

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

commit 867c5719227f7fdc649513ed6424b3e4a901443e
Merge: 2df6e11 83cbb24
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 13 02:24:15 2015 -0700

    Merge branch 'redis_config' of git://github.com/BigMichi1/horde into BigMichi1-redis_config

 framework/Core/lib/Horde/Core/Factory/HashTable.php |    4 +++-
 horde/config/conf.xml                               |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/867c5719227f7fdc649513ed6424b3e4a901443e

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

commit 2f32d252aa09310bbb2e7f0b6c8b1537160cc4f9
Merge: 2df6e11 867c571
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 13 02:25:03 2015 -0700

    Merge branch 'BigMichi1-redis_config'

 framework/Core/lib/Horde/Core/Factory/HashTable.php |    4 +++-
 horde/config/conf.xml                               |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/2f32d252aa09310bbb2e7f0b6c8b1537160cc4f9