# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1268495092 -3600
# Node ID b7e528212828b38c788cf8363282c9b70d7650c1
# Parent  4c50a90b90fc912ab007555a6b93fb87baa0ca11# Parent  9602fc4e6914c9cf272c0b1b0173b410ca9282f4
merge with stable

diff -r 4c50a90b90fc -r b7e528212828 contrib/mercurial.spec
--- a/contrib/mercurial.spec	Fri Mar 12 01:23:35 2010 +0100
+++ b/contrib/mercurial.spec	Sat Mar 13 16:44:52 2010 +0100
@@ -67,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
+%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi
 %doc %attr(644,root,root) %{_mandir}/man?/hg*
 %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
 %{_sysconfdir}/bash_completion.d/mercurial.sh