[belgium 2014] talk Theo Schlossnagle
Merge pull request #1166 from rgevaert/master

[belgium 2014] talk Theo Schlossnagle