From 5ef2da5c3966e06020f6a19358e08b0ff96212c7 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 15 Sep 2014 16:26:54 -0400
Subject: [PATCH] Add Martin Michlmayr to the board page

---
 www/conservancy/static/about/board/index.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/www/conservancy/static/about/board/index.html b/www/conservancy/static/about/board/index.html
index 07915732..e1fd0010 100644
--- a/www/conservancy/static/about/board/index.html
+++ b/www/conservancy/static/about/board/index.html
@@ -106,6 +106,19 @@ and is chair of the Open Definition Advisory Council. From 2003 to
 Senior Fellow. In 2000 he co-founded Bitzi, an early open content/open
 data mass collaboration platform.</p>
 
+<h2>Martin Michlmayr</h2>
+
+<p>Martin Michlmayr has been involved in various free and open source
+software projects for well over 15 years.  He acted as the leader of the
+Debian project for two years, served on the board of the Open Source
+Initiative (OSI) for six years and currently serves on the board of
+Software Freedom Conservancy.  Martin works for HP as an Open Source
+Community Expert.  In this role, he facilitates open source activities both
+internally within HP as well as externally within the broader open source
+community.  Martin earned a PhD from the University of Cambridge and he
+received an O'Reilly Open Source Award in 2013 for his contributions to the
+open source community.</p>
+
 <h2>Stormy Peters</h2>
 
 <p>Stormy Peters is Head of Developer Engagement at Mozilla. She is