Re: svn commit: r1067785 [1/2] - in /directory/shared/branches/m1: ./ all/ dsml-parser/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml-parser/src/main/java/org/

[Alex Karasulu]

On Mon, Feb 7, 2011 at 12:20 AM, Stefan Seelmann <seelm...@apache.org>wrote:

> Hi Alex,
>
> On Sun, Feb 6, 2011 at 11:13 PM,  <akaras...@apache.org> wrote:
> > Author: akarasulu
> > Date: Sun Feb  6 22:13:35 2011
> > New Revision: 1067785
> >
> > URL: http://svn.apache.org/viewvc?rev=1067785&view=rev
> > Log:
> > merge minor changes from trunk: TRUNK ==> M1 branch
>
> I try to make only changes that should not cause merge conflicts, to
> reduce the merge pain.
>

Thanks Stefan but please don't hold back if there are things you need to get
done. I'll gladly deal with merge conflicts.

Regards,
-Alex