remove cvs2svn:cvs-rev prop
add dovecot 2.x port and CONFLICTS on dovecot 1
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.