Merge: Rosetta entropy
authorJean Privat <jean@pryen.org>
Mon, 13 Jul 2015 20:24:46 +0000 (16:24 -0400)
committerJean Privat <jean@pryen.org>
Mon, 13 Jul 2015 20:24:46 +0000 (16:24 -0400)
commitb332a6d0f34a1c73802a113935c12d62843f6a1f
tree186be5ad1a5055305d7bb44201511469e478de91
parentb0dbd98a1dab926a2e797cc20c327c0fb75f1e8a
parent07d7d9da6bcd2e0095faa05a415468d86e1edde1
Merge: Rosetta entropy

Pull-Request: #1561
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>