Merge branch 'master' of https://github.com/mortberg/cubicaltt
authorRafaël Bocquet <rafaelbocquet+github@gmail.com>
Tue, 5 Apr 2016 09:30:19 +0000 (11:30 +0200)
committerRafaël Bocquet <rafaelbocquet+github@gmail.com>
Tue, 5 Apr 2016 09:30:19 +0000 (11:30 +0200)

Trivial merge