Author: jleroux Revision: 1390845 Modified property: svn:log Modified: svn:log at Thu Sep 27 05:55:15 2012 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Sep 27 05:55:15 2012 @@ -1,4 +1,4 @@ -"Applied fix from trunk for revision: 1390542" +"Applied fix from trunk for revision: 1390542" (conflicts handled by hand) ------------------------------------------------------------------------ r1390542 | sascharodekamp | 2012-09-26 17:03:23 +0200 (mer., 26 sept. 2012) | 1 line

