A good way to ensure that we never come to a decision is to change

the voting options without carrying-over the votes already cast,
as was done when this was split into mutually contradictory alternatives.
Merge them together so people can see what is the actual status.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80823 13f79535-47bb-0310-9956-ffa450edef68