CppCon/CppCon2014 — pull request #2 by soowei (2014-10-03 00:12:16+00:00)
Title: Merge pull request #1 from CppCon/master

Merge from master