[commits] Horde branch FRAMEWORK_5_2 updated. 7bef67e5408437dd239587a4d7300840d6e73b69

[Jan Schneider]

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

from: 3cdfa9855af4b4533befbaad607686acfaf7272d

711bcb3 Add option to specify framework location.
a64243f Fix using custom SQL driver configuration.
7bef67e [jan] Fix using custom SQL driver configuration.

Summary: http://github.com/horde/horde/compare/3cdfa9855af4b4533befbaad607686acfaf7272d...7bef67e5408437dd239587a4d7300840d6e73b69

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

commit 711bcb30596b1fc716528fa4cd9f47c5203b7894
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 21 18:09:50 2015 +0100

    Add option to specify framework location.

 framework/bin/install_dev           |   13 ++++++++++---
 framework/bin/install_dev.conf.dist |    3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/711bcb30596b1fc716528fa4cd9f47c5203b7894

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

commit a64243f2bd2d089c75eff16f7be1c6797994e2ad
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 21 18:10:23 2015 +0100

    Fix using custom SQL driver configuration.
    
    Conflicts:
    	mnemo/lib/Factory/Driver.php

 mnemo/lib/Factory/Driver.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

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

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

commit 7bef67e5408437dd239587a4d7300840d6e73b69
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 21 18:25:39 2015 +0100

    [jan] Fix using custom SQL driver configuration.

 mnemo/docs/CHANGES |    1 +
 mnemo/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/7bef67e5408437dd239587a4d7300840d6e73b69