| commit | 14652299573e7e6bdd34a20d7da31c2519f68ebe | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Fri, 19 Sep 2014 22:35:09 +0000 (20 00:35 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Fri, 19 Sep 2014 22:35:09 +0000 (20 00:35 +0200) | ||
| tree | 0eef086f0dffa04cda1036d1fe5ca28f76dc96b6 | treesnapshot (tar.gz zip) |
| parent | b82f1cb2c229cc806f3cd9bb79bdcd35d0aa6a69 | commitdiff |
| parent | 2d02479c344e21afd80ad88defd2a0766e5ed4ce | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
Conflicts:
doc/org.texi
| doc/org.texi | diff1 | diff2 | blobhistory |