[commits] Horde branch master updated. 78ee9096341b08c8fc4925d8e0cbb08cbe3a7575

[Michael J. Rubinsky]

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

from: 7ddade14b7800af1d443162f7ae7e0425e9f29f7

78ee909 Fix botched merge.

Summary: http://github.com/horde/horde/compare/7ddade14b7800af1d443162f7ae7e0425e9f29f7...78ee9096341b08c8fc4925d8e0cbb08cbe3a7575

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

commit 78ee9096341b08c8fc4925d8e0cbb08cbe3a7575
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 27 11:28:51 2015 -0400

    Fix botched merge.

 wicked/package.xml |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/78ee9096341b08c8fc4925d8e0cbb08cbe3a7575