[commits] Horde branch develop updated. ff1c0a8415a974362929fea07a12e54be1d50737

[Michael M Slusarz]

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

from: e95e0ff02440dc17c62f87ce59a652180aea10ff

ff1c0a8 Revert "Fix botched merges."

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

commit ff1c0a8415a974362929fea07a12e54be1d50737
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 25 15:27:57 2012 -0600

    Revert "Fix botched merges."
    
    This reverts commit 9611207f3688474bea6648a109d53ad22195e687.
    
    Conflicts:
    	imp/package.xml
    	ingo/package.xml
    
    These are not botched merges.  Per discussion on dev@ a while back, we
    made the decision to specifically not add any changelog information to
    package.xml since it causes a guaranteed merge conflict (another reason
    that merging from master -> develop doesn't make sense).
    
    This is why the --nopackage option to horde-components was added.

 horde/package.xml     |    8 +-------
 imp/package.xml       |    5 +----
 ingo/package.xml      |    5 +----
 kronolith/package.xml |   15 ++-------------
 nag/package.xml       |    2 +-
 turba/package.xml     |    3 +--
 whups/package.xml     |    5 +++--
 7 files changed, 10 insertions(+), 33 deletions(-)

http://git.horde.org/horde-git/-/commit/ff1c0a8415a974362929fea07a12e54be1d50737