From 8783dd6e83a694661fa9863a5920754c3b98a293 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 8 Jul 2014 16:14:34 -0700
Subject: [PATCH] oscon

---
 index.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/index.html b/index.html
index c807ff4..c4eac35 100644
--- a/index.html
+++ b/index.html
@@ -25,6 +25,27 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
 
         <tr>
           <td align="center">
+<a href="http://oscon.com/oscon14?cmp=ba-prog-confreg-home-os14_exhibitor_banner_125_125">
+<img src="http://cdn.oreillystatic.com/en/assets/1/event/115/oscon2014_exhibiting_125x125.gif" width="125" height="125"  border="0"  alt="OSCON 2014"  />
+</a>
+          </td>
+
+          <td align=top>
+<!--            <h4>We're exhibiting!</h4> -->
+            <h5>&nbsp;OSCon</h5>
+            <h4>Bluehost booth</h4>
+            <h4>Jul 21-23, 2014</h4>
+            <h4>Portland, Oregon</h4>
+          </td>
+        </tr>
+
+        <tr>
+          <td colspan=2>
+          </td>
+        </tr>
+
+        <tr>
+          <td align="center">
             <a href="http://www.wispapalooza.net/" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISPAPalooza"></a>
           </td>
 
@@ -42,6 +63,7 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
           </td>
         </tr>
 
+
       </table>
 
       <table width="420" height="*" border="0" cellpadding="0" cellspacing="0">
-- 
2.11.0