aboutsummaryrefslogtreecommitdiff

2014-12-19Merge branch 'nix' into 'master'.Ludovic Courtès