===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/plus.html,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- www/plus.html	2016/02/29 19:50:50	1.1379
+++ www/plus.html	2016/02/29 20:14:58	1.1380
@@ -68,13 +68,16 @@
 <a href="plus56.html">5.6</a>,
 <a href="plus57.html">5.7</a>,
 <a href="plus58.html">5.8</a>.
+<a href="plus59.html">5.9</a>,
 <br>
 
 <p>
-<h3><font color="#0000e0">Changes made between OpenBSD 5.8 and -current</font></h3>
+<h3><font color="#0000e0">Changes made between OpenBSD 5.9 and -current</font></h3>
 <p>
 
 <ul>
+<<<<<<< plus.html
+=======
 <!-- 2015-10-15 -->
 <li>Add the _rebound user and group in order to improve privdrop for <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/rebound.8">rebound(8)</a>.
 <li>Use <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/pledge.2">pledge(2)</a> in <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/ftp.1">ftp(1)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/identd.8">identd(8)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/login_token.8">login_token(8)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/rebound.8">rebound(8)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/sdiff.1">sdiff(1)</a>.
@@ -773,6 +776,7 @@
 <li>Fix recent regressions in <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man4/ugold.4">ugold(4)</a>.
 <!-- 2015-08-10 -->
 <li>Improve <a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/openssl.1">openssl(1)</a> s_client -starttls xmpp support.
+>>>>>>> 1.1379
 </ul>
 <p>