
Zitat von Jan Schneider <jan@horde.org>:


> commit 1960778fb792d6fa061ab03420e5ddb6cc0a273a
> Merge: 16eb699 febebbc
> Author: Jan Schneider <jan@horde.org>
> Date:   Tue Dec 13 15:07:23 2011 +0100
>
>     Merge branch 'master' into develop
>
>     Conflicts:
>     	framework/Core/package.xml
>     	framework/Date/package.xml
>     	horde/lib/Application.php
>     	horde/package.xml
>     	imp/js/dimpbase.js
         ^^^^^^^^^^^^^^^^^^
I didn't resolve this conflict, because I didn't know which version  
was correct.

>     	imp/lib/Application.php
>     	imp/package.xml
>     	ingo/lib/Application.php
>     	ingo/package.xml
>     	kronolith/lib/Application.php
>     	kronolith/package.xml
>     	mnemo/lib/Application.php
>     	mnemo/package.xml
>     	nag/lib/Application.php
>     	nag/package.xml


