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

2 files changed, 12 insertions, 5 deletions

diff --git a/archive.html b/archive.html
index 19f53ad..42440cf 100755
--- a/archive.html
+++ b/archive.html
@@ -28,6 +28,11 @@
         <div id="news" class="news">
           <h2>News Archive</h2>
           <div class="newsitem">
+            <p class="date">January 2012</p>
+            <h3>Visiting Researcher</h3>
+            <p>We are pleased to welcome Prof. Gerhard Fohler, from TU Kaiserslautern, Germany, who will be visiting for a month.</p>
+          </div>
+          <div class="newsitem">
             <p class="date">August 2011</p>
             <h3>Cyber-Physical Systems Course</h3>
             <p>This fall, Prof. Jim Anderson is conducting a course on cyber-physical systems, a first for our department. More information on the course is available <a href="http://www.cs.unc.edu/~anderson/teach/comp790c/">here</a>.</p>
diff --git a/index.html b/index.html
index e37a9f9..fe02984 100755
--- a/index.html
+++ b/index.html
@@ -31,12 +31,14 @@
            <hr />
           <h2>News</h2>
           <div class="newsitem">
-            <p class="date">January 2012</p>
+            <p class="date">February 2012</p>
             <h3>Visiting Researchers</h3>
-            <p>We are pleased to welcome two visiting researchers.
-            Starting in late January, Prof. Gerhard Fohler, from TU Kaiserslautern, Germany, will be visiting for a month.
-            Starting in late February, Prof. Alan Burns, from the Univ. of York, UK, will be visiting for a week.
-            </p>
+            <p>We are pleased to welcome Vincenzo Bonifaci, Alberto Marchetti-Spaccamela, Leen Stougie, and Andreas Wiese, who will be visiting March 14-21.</p>
+          </div>
+          <div class="newsitem">
+            <p class="date">February 2012</p>
+            <h3>Visiting Researcher</h3>
+            <p>We are pleased to welcome Prof. Alan Burns, from the Univ. of York, UK, who is visiting for one week.</p>
           </div>
           <div class="newsitem">
           <h3>Archive</h3>