Commit graph

2 commits

Author SHA1 Message Date
Ludovic Courtès
15ddeff532 Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'. 2015-01-04 23:27:34 +01:00
Ludovic Courtès
36457566f9 Merge branch 'nix' into 'master'. 2014-12-19 22:47:37 +01:00