Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/rthp

2 files changed, 2 insertions, 2 deletions

diff --git a/conferences.csv b/conferences.csv
index 6a4391b..e46aeb1 100644
--- a/conferences.csv
+++ b/conferences.csv
@@ -6,7 +6,7 @@ ETFA,http://www.etfa2012.org/,"Krakow, Poland",3/25/2012,9/17/2012,9/21/2012
 RTCSA,http://rtcsa.konkuk.ac.kr/,"Seoul, Korea",4/16/2012,8/20/2012,8/22/2012
 "ESWeek (3 Conferences)",http://www.esweek.org/,"Tampere, Finland",4/11/2011,10/9/2011,10/14/2011
 RTLWS,https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html,"Chapel Hill, NC",TBD,10/18/2012,10/20/2012
-RTNS,http://rtns2011.irccyn.ec-nantes.fr/#page=home,"Nancy, France",TBD,11/8/2012,11/9/2012
+RTNS,http://rtns2012.loria.fr/,"Pont a Mousson, France",6/1/2012,11/8/2012,11/9/2012
 OPODIS,http://www.opodis.net/,"Toulouse, France",7/22/2011,12/12/2011,12/16/2011
 IPDPS,http://www.ipdps.org/,"Shanghai, China",10/2/2011,5/21/2012,5/25/2012
 LAW,http://www.acsac.org/2011/workshops/law/,"Orlando, FA",9/29/2011,12/5/2011,12/9/2011
diff --git a/conferences.html b/conferences.html
index efbfbb9..e97c3d0 100644
--- a/conferences.html
+++ b/conferences.html
@@ -45,8 +45,8 @@
             <tr><td>Mar. 25, 2012</td><td><a href="http://www.etfa2012.org/">ETFA</a></td><td>Krakow, Poland</td><td>Sep. 17 &ndash; 21, 2012</td></tr>
             <tr><td>Apr. 16, 2012</td><td><a href="http://rtcsa.konkuk.ac.kr/">RTCSA</a></td><td>Seoul, Korea</td><td>Aug. 20 &ndash; 22, 2012</td></tr>
             <tr><td>May. 15, 2012</td><td><a href="http://sites.ieee.org/rtss2012/">RTSS</a></td><td>San Juan, Puerto Rico</td><td>Dec. 5 &ndash; 7, 2012</td></tr>
+            <tr><td>Jun. 1, 2012</td><td><a href="http://rtns2012.loria.fr/">RTNS</a></td><td>Pont a Mousson, France</td><td>Nov. 8 &ndash; 9, 2012</td></tr>
             <tr><td>TBD</td><td><a href="https://www.osadl.org/RTLWS-2012.rtlws-2012.0.html">RTLWS</a></td><td>Chapel Hill, NC</td><td>Oct. 18 &ndash; 20, 2012</td></tr>
-            <tr><td>TBD</td><td><a href="http://rtns2011.irccyn.ec-nantes.fr/#page=home">RTNS</a></td><td>Nancy, France</td><td>Nov. 8 &ndash; 9, 2012</td></tr>
         </table>
       </div>
     </div>