From f9d1229947ec14c447f033c8f50f0df9423b6fc1 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 23 Dec 2015 11:27:32 -0800
Subject: [PATCH] Add SLUG16 info to web page

---
 doc/html/meetings.shtml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml
index feec2363e15..a783ae20215 100644
--- a/doc/html/meetings.shtml
+++ b/doc/html/meetings.shtml
@@ -2,18 +2,23 @@
 
 <h1>Meetings</h1>
 
-<p><b>Slurm User Group Meeting 2015</b><br>
-15-16 September 2015<br>
-Washington DC, USA<br>
-Host: <a href="http://www.gwu.edu/">The George Washington University</a></p>
-<!-- <p>More information to come soon.</p>-->
+<p><b>Slurm User Group Meeting 2016</b><br>
+26-27 September 2016<br>
+Athens, Greece<br>
+Host: <a href="http://www.grnet.gre/">Greek Research and Technology Network (GRNET)</a></p>
+<p>More information coming soon.</p>
 <!-- <a href="slurm_ug_cfp.html">Call for Abstracts: Due 1 June 2015</a><br> -->
-<a href="slurm_ug_agenda.html">Meeting agenda, registration information, etc.</a><br>
+<!-- <a href="slurm_ug_agenda.html">Meeting agenda, registration information, etc.</a><br> -->
 <!-- <a href="slurm_ug_agenda.html#hotels">Meeting hotels</a><br> -->
 
 <br>
 <h2>Previous Meetings</h2>
 
+<p><b>Slurm User Group Meeting 2015</b><br>
+15-16 September 2015<br>
+Washington DC, USA<br>
+Host: The George Washington University</p>
+
 <p><b>Slurm User Group Meeting 2014</b><br>
 23-24 September 2014<br>
 Lugano, Switzerland<br>
@@ -39,6 +44,6 @@ Host: Bull</p>
 Paris, France<br>
 Host: CEA</p>
 
-<p style="text-align:center;">Last modified 7 July 2015</p>
+<p style="text-align:center;">Last modified 23 December 2015</p>
 
 <!--#include virtual="footer.txt"-->
-- 
GitLab