[commits] Horde branch master updated. 0c48e9c3575fd7a448f697d700319895d604d015

[Jan Schneider]

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

from: 8055d72e62b561e359a1ca1a4d03e5663a49a35b

0c48e9c Revert "This was only a temporarily regression in Git."

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

commit 0c48e9c3575fd7a448f697d700319895d604d015
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 8 19:51:08 2011 +0200

    Revert "This was only a temporarily regression in Git."
    
    This reverts commit 6047dd2367bc322fbe0cf037c7a7e92e4dbd1729.
    
    Conflicts:
    
    	imp/package.xml

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

http://git.horde.org/horde-git/-/commit/0c48e9c3575fd7a448f697d700319895d604d015