| commit | c00379dc7702f25b8e1990e512dc540caae790d7 | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 1 Jun 2014 06:54:44 +0000 (1 08:54 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 1 Jun 2014 06:54:44 +0000 (1 08:54 +0200) | ||
| tree | e0c1e0f77c8bfce7e95cc74931a772a26b8d1b20 | treesnapshot (tar.gz zip) |
| parent | 51e1131ff878aead16e3b9c8e17ebdc9406b4e64 | commitdiff |
| parent | c34121c60fdea0e6be8ce5d1b6c1920d3d44dac5 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
Conflicts:
doc/org.texi
| doc/org.texi | diff1 | diff2 | blobhistory |
| doc/orgguide.texi | diff1 | diff2 | blobhistory |