[commits] Horde branch master updated. f29d4c40e1e27e536cc963b96516770a09bec7ba

[Michael J. Rubinsky]

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

from: 375e509e6c45e4f36d257aab483c85457bdbed41

f29d4c4 BFN

Summary: http://github.com/horde/horde/compare/375e509e6c45e4f36d257aab483c85457bdbed41...f29d4c40e1e27e536cc963b96516770a09bec7ba

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

commit f29d4c40e1e27e536cc963b96516770a09bec7ba
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 4 12:45:01 2014 -0500

    BFN
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

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

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