CppCon/CppCon2014 — pull request #3 by soowei (2014-10-06 17:37:22+00:00)
Title: Merge pull request #1 from CppCon/master

Merge from master