Permalink
Browse files

Merge pull request #239 from awolfs/master

Fix missing talks
  • Loading branch information...
2 parents 6228e0b + cc41d3a commit b23726f47350dea0d127d407f9011d12f4104bd0 @jedi4ever committed Apr 11, 2013
@@ -23,15 +23,12 @@ Martin Englund is a Principal Engineer at Pivotal, where he works on BOSH - the
Martin has over twenty years of experience in security and automation, and has contributed to other automation tools, like Puppet. Prior to this role, he worked at Sun Microsystems as a Principal Security Engineer running Sun's external web presence, in Java Security Engineering and the Sun IT Security Office, where he was responsible for creating the standards and tools used by Sun IT to secure its servers. He has also authored numerous technical papers on security, including co-authoring the Solaris Security Essentials book.
-<<<<<<< HEAD
twitter: @pmenglund
-
blog: http://blog.codenursery.com/
linkedin: http://www.linkedin.com/in/pmenglund
=======
Twitter: @pmenglund
Blog: http://blog.codenursery.com/
Linkedin: http://www.linkedin.com/in/pmenglund
->>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event

0 comments on commit b23726f

Please sign in to comment.