| commit | f05d148e61e7b0c96dde54864386cc400ca4bd28 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 6 Feb 2014 10:36:50 +0000 (6 11:36 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 6 Feb 2014 10:36:50 +0000 (6 11:36 +0100) | ||
| tree | 06e4be503ea9cabf25d042c274ad50e022fa6441 | treesnapshot (tar.gz zip) |
| parent | 0db6b241640517aedc9c8e96a14c6f028916f0a1 | commitdiff |
| parent | 49b25fff59f049770ad190730ba1f8a0bb6f864a | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
Conflicts:
doc/org.texi
| doc/org.texi | diff1 | diff2 | blobhistory |