15:39 lev 

 (1) Update to 1.10.3.
 (2) Fix STATIC build.
 (3) Expand FreeBSD template for better explanation of "Sponsored by"

PR:		(2) 220660, (3) 228362

 

12:00 des 

Regenerate with make makepatch and add a description.

 

14:06 des 

Add patch from upstream commit r1839662, which fixes automatic conflict
resolution for files removed from the merge target when the merge source
and merge target have no proper common ancestor.  This is a depressingly
common scenario in the FreeBSD base tree.

Approved by:	maintainer (lev)
Obtained from:	https://svn.apache.org/r1839662