Merge branch 'hpanderson_cmake' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:07:27 +0000 (04:07 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:07:27 +0000 (04:07 +0800)

Trivial merge