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)
commitb50920ffc27a0f6b0020095af06e705f14894fad
tree586911f02b541dbd1d7be62498c450b6c2d2dff2
parentdb4f08d9412af737c41dbc942be23bc2d33ab0fd
parentca8b50eff1e9341159416c8b53f2d1d11b99591b
Merge branch 'master' into feature-normalized-cpu