CVSROOT: /web/www
Module name: www
Changes by: Yavor Doganov <yavor> 12/01/28 10:02:03
Modified files:
server : whatsnew.fr.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/whatsnew.fr.html?cvsroot=www&r1=1.64&r2=1.65
Patches:
Index: whatsnew.fr.html
===================================================================
RCS file: /web/www/www/server/whatsnew.fr.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- whatsnew.fr.html 28 Jan 2012 09:26:32 -0000 1.64
+++ whatsnew.fr.html 28 Jan 2012 10:01:38 -0000 1.65
@@ -56,7 +56,11 @@
<!-- timestamp start -->
Dernière mise à jour :
-$Date: 2012/01/28 09:26:32 $
+<<<<<<< whatsnew.fr.html
+$Date: 2012/01/28 10:01:38 $
+=======
+$Date: 2012/01/28 10:01:38 $
+>>>>>>> 1.64
<!-- timestamp end -->
</p>