Merge branch 'hpanderson_cmake' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 10 Aug 2015 19:31:55 +0000 (03:31 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 10 Aug 2015 19:31:55 +0000 (03:31 +0800)

Trivial merge