svn propchange: r1209921 - svn:log

Author: jleroux
Revision: 1209921
Modified property: svn:log

Modified: svn:log at Sat Dec  3 14:51:11 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Dec  3 14:51:11 2011
@@ -1,4 +1,4 @@
-"Applied fix from trunk for revision: 1063228"
+"Applied fix from trunk for revision: 1063228"  (conflict handled by hand)
 ------------------------------------------------------------------------
 r1063228 | jleroux | 2011-01-25 12:25:23 +0100 (mar., 25 janv. 2011) | 1 line