[commits] Horde branch master updated. 6cae5d11b8275fc5bf8ba1c64467035652844650

[Michael J. Rubinsky]

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

from: 37327ff12771bb027e71ead95d6e0792e6837014

bec8f49 [mjr] Fix using custom SQL configuration parameters.
6cae5d1 [mjr] Fix using custom SQL configuration parameters.

Summary: http://github.com/horde/horde/compare/37327ff12771bb027e71ead95d6e0792e6837014...6cae5d11b8275fc5bf8ba1c64467035652844650

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

commit bec8f49f913a6ff5c776e426230483007f1b7cce
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Feb 13 10:10:25 2015 -0500

    [mjr] Fix using custom SQL configuration parameters.
    
    Conflicts:
    	mnemo/docs/CHANGES
    	mnemo/package.xml

 mnemo/docs/CHANGES |    8 ++++++++
 mnemo/package.xml  |   13 +++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

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

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

commit 6cae5d11b8275fc5bf8ba1c64467035652844650
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Feb 13 10:10:35 2015 -0500

    [mjr] Fix using custom SQL configuration parameters.
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

 kronolith/docs/CHANGES |    7 +++++++
 kronolith/package.xml  |   13 +++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/6cae5d11b8275fc5bf8ba1c64467035652844650