Merge: After new loader
authorJean Privat <jean@pryen.org>
Fri, 28 Aug 2015 20:37:08 +0000 (16:37 -0400)
committerJean Privat <jean@pryen.org>
Fri, 28 Aug 2015 20:37:08 +0000 (16:37 -0400)
commita22e7fcbb0d13a176d384d7a6c798495d7152320
tree5a409e95ee6b813ba7a11d35ffd330167acf87c0
parentcd783aebc2928d5763848e81bad89994e852cd79
parentb1463024ee53b315952eefa7e88476dcaa3b63f3
Merge: After new loader

Some cleanup since the new loader landed (cf. #1654)

Pull-Request: #1668
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>