Author: philip
Revision: 1417733
Modified property: svn:log
Modified: svn:log at Fri Dec 7 10:57:45 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Dec 7 10:57:45 2012
@@ -7,4 +7,3 @@ Merge r1409146 from trunk:
Handles a Windows specific corner case in a generic conversion function.
Votes:
+1: rhuijben, stefan2, pburba
->>>>>>> .r1417732