Merge remote-tracking branch 'github/cmake-migration'
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Wed, 19 Mar 2014 16:08:35 +0000 (16:08 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Wed, 19 Mar 2014 16:08:35 +0000 (16:08 +0000)

Trivial merge