Merge branch 'release/unstable'

Conflicts:
	Documentation/web/news-front.itexi

diff --cc Documentation/web/news-front.itexi
index ffb32e19e0787a0ed05a823d16298d71bb9179e1,d4b10d21e460ed0981b09e3663747456ea7c5717..41b77d46d20efb513437cea0828a1a697b88074d
--- 1/Documentation/web/news-front.itexi
--- 2/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@@ -19,7 -19,7 +19,11 @@@ listed in the @qq{Changes} manual on th
  
  There are no known Critical issues with this release.  If no
  Critical bugs are found, then the official 2.14.0 release will be
++<<<<<<< HEAD
 +on April 5, 2011.  If you discover any problems, please send us
++=======
+ on April 2, 2011.  If you discover any problems, please send us
++>>>>>>> release/unstable
  @ref{Bug reports}.
  
  @newsEnd