[commits] Horde branch develop updated. 75984d3b7c4bb9fad0ad607eb5ad8538fdecc2bb

[Michael J. Rubinsky]

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

from: 277efe25cd72450352040f804c7e7b2c0a001fb4

75984d3 Revert "Merge resolution?"

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

commit 75984d3b7c4bb9fad0ad607eb5ad8538fdecc2bb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 17:01:48 2011 -0400

    Revert "Merge resolution?"
    
    This reverts commit e9638e7b64d8f07086ed3991b2da0d6ea9d81568.

 horde/config/conf.xml |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/75984d3b7c4bb9fad0ad607eb5ad8538fdecc2bb