[commits] Horde branch master updated. 2b17dfefec5cd670a890ec372fa3a1545d8f2693

[Michael J. Rubinsky]

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

from: 1dd6f8fcbd7d42378e1024b5d8cd5e454a006053

2b17dfe BFN

Summary: http://github.com/horde/horde/compare/1dd6f8fcbd7d42378e1024b5d8cd5e454a006053...2b17dfefec5cd670a890ec372fa3a1545d8f2693

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

commit 2b17dfefec5cd670a890ec372fa3a1545d8f2693
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Jan 16 18:04:26 2015 -0500

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

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

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