| commit | 6c3ef6226625156066ae7f9dc0d41fbd499f6ae2 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 8 Jan 2013 11:11:08 +0000 (8 12:11 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 8 Jan 2013 11:11:08 +0000 (8 12:11 +0100) | ||
| tree | f346c0ef8028626185b99b30e1589905f73047eb | treesnapshot (tar.gz zip) |
| parent | 86737d323e99645dd37134516fec3b813385c409 | commitdiff |
| parent | 2d81219147719317887cdedc5286b1afa5bfb9d1 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/orgguide.texi
Conflicts:
doc/orgguide.texi
| doc/orgguide.texi | diff1 | diff2 | blobhistory |