Merge branch 'cmake'
authorFelix Morgner <felix.morgner@gmail.com>
Tue, 14 Jan 2014 00:17:41 +0000 (01:17 +0100)
committerFelix Morgner <felix.morgner@gmail.com>
Tue, 14 Jan 2014 00:17:41 +0000 (01:17 +0100)

Trivial merge