Author: elecharny
Date: Thu Nov 10 14:28:12 2011
New Revision: 1200345

URL: http://svn.apache.org/viewvc?rev=1200345&view=rev
Log:
Just to mark that I merged back from trunk

Modified:
    directory/apacheds/branches/apacheds-txns/kerberos-test/   (props changed)

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 14:28:12 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
 /directory/apacheds/trunk/interceptors/kerberos-test:1183435-1186974
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186962
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1200286
 /directory/studio/trunk/kerberos-test:1067786-1067997