Merge branch 'master' of git.freeside.biz:/home/git/www

diff --combined index.html
index 41c47a1,8aeff66..9700fa8
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -20,15 -20,16 +20,15 @@@
  
          <tr>
            <td align="center">
 -            <a href="http://www.wispamerica.net/" target="_blank"><img src="wispamerica2014.png" border=0 align="center" alt="WISP America"></a>
 +            <a href="http://www.wispamerica.net/" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISP America"></a>
            </td>
  
            <td align=top>
  <!--            <h4>We're exhibiting!</h4> -->
 -            <h5>&nbsp;WISP America</h5>
 -            <h4>Booth #110</h4>
 -            <h4>Mar 25-27, 2014</h4>
 -            <h4>Little Rock, Arkansas</h4>
 -            &nbsp;&nbsp;&nbsp;<a href="http://www.freeside.biz/blog/2014/03/wispamerica-coupon/" STYLE="font-size:150%">Discount coupon</a>
 +            <h5>&nbsp;WISPAPalooza</h5>
 +            <h4>Booth #136</h4>
 +            <h4>Oct 14-16, 2014</h4>
 +            <h4>Las Vegas, Nevada</h4>
            </td>
          </tr>
          <tr>
@@@ -55,14 -56,14 +55,19 @@@
          <tr> 
            <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
            <td height="*" align="center" valign="top" bgcolor="#A5A3A3"><table width="100%" border="0" cellpadding="2" cellspacing="5">
+             
+             <tr align="left" valign="top">
+                 <td width="115" align="right" valign="top"><b>Apr&nbsp;2&nbsp;2014:</b></td>
+                 <td width="*"><a href="blog/2014/04/freeside-2-3-9-released/">2.3.9 released</a></td>
+               </tr>
  
                <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Mar&nbsp;16-18&nbsp;2014:</b></td>
 +                <td width="115" align="right" valign="top"><nobr><b>Mar&nbsp;25-27&nbsp;2014:</b></nobr></td>
 +                <td width="*">Exhibited at <a href="http://www.wispamerica.net/">WISP America</a></td>
 +              </tr>
 +
 +              <tr align="left" valign="top"> 
 +                <td width="115" align="right" valign="top"><nobr><b>Mar&nbsp;16-18&nbsp;2014:</b></nobr></td>
                  <td width="*">Exhibited at <a href="http://www.comptelplus.org/">CompTel Plus</a></td>
                </tr>
  
@@@ -72,17 -73,17 +77,17 @@@
                </tr>
  
                <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Feb&nbsp;19-21&nbsp;2014:</b></td>
 +                <td width="115" align="right" valign="top"><nobr><b>Feb&nbsp;19-21&nbsp;2014:</b></nobr></td>
                  <td width="*">Exhibited at <a href="http://fispalive.com/">FISPA Live</a></td>
                </tr>
  
                <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Jan&nbsp;29-31&nbsp;2014:</b></td>
 +                <td width="115" align="right" valign="top"><nobr><b>Jan&nbsp;29-31&nbsp;2014:</b></nobr></td>
                  <td width="*">Exhibited at <a href="http://www.tmcnet.com/voip/conference/digium-asterisk-world/">Asterisk World</a> / <a href="http://itexpo.tmcnet.com/east/">Internet Telephony Expo</a></td>
                </tr>
  
                <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Oct&nbsp;14-18&nbsp;2013:</b></td>
 +                <td width="115" align="right" valign="top"><b><nobr>Oct&nbsp;14-18&nbsp;2013:</b></nobr></td>
                  <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispapalooza-2013/event-summary-95ba2d6f4ba1492f8041f2306f4c7786.aspx">WISPAPALOOZA</a></td>
                </tr>
  
@@@ -92,7 -93,7 +97,7 @@@
                </tr>
  
                <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Aug&nbsp;28&#8209;29&nbsp;2013:</b></td>
 +                <td width="115" align="right" valign="top"><b><nobr>Aug&nbsp;28-29&nbsp;2013:</b></nobr></td>
                  <td width="*">Exhibited at <a href="http://itexpo.tmcnet.com/">Internet Telephony Expo</a>, awarded Best of Show!</td>
                </tr>
  
@@@ -106,6 -107,11 +111,6 @@@
                  <td width="*"><a href="/blog/2013/07/freeside-2.3.7-released">2.3.7 released</a></td>
                </tr>
  
 -              <tr align="left" valign="top"> 
 -                <td width="115" align="right" valign="top"><b>Apr&nbsp;2&#8209;4&nbsp;2013:</b></td>
 -                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispamerica-2013/event-summary-680c2490ae68460b8b70edd02b360118.aspx">WISPAmerica</a></td>
 -              </tr>
 -
              </table></td>
            <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
          </tr>