[resolve conflict in index.html
Ganesh Sittampalam <ganesh@earth.li>**20100227222851
 Ignore-this: e899f6fbadc1f21724c459ce406ab042
] hunk ./doc/index.html 54
-      <li>Darcs 2010 <a href="donations.html">fundraising drive</a> - we
-      aim to raise $2000 by 15 February.</li>
-      <li>Darcs 2.4 is currently being prepared for release.  See the
-      <a href="http://wiki.darcs.net/Releases/2.4">release page</a> for
-      more information.</li>
+      <li><a href="announce.html">Darcs 2.4 release</a>, announced 27 February 2010.</li>