Code

Merge branch 'master' into feature-normalized-cpu
authorPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 07:54:24 +0000 (08:54 +0100)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 07:54:24 +0000 (08:54 +0100)

Trivial merge