Adds mod_macro french and resolves svn (minor) svn conflicts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436372 13f79535-47bb-0310-9956-ffa450edef68