| commit | 48703624d5a7f13e5408debd2f01dbf7ac6020f4 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sun, 9 Dec 2012 22:48:29 +0000 (9 23:48 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sun, 9 Dec 2012 22:48:29 +0000 (9 23:48 +0100) | ||
| tree | aa16651770884e911d8c0cf929a6562517de21a2 | treesnapshot (tar.gz zip) |
| parent | 66c6642e68f77f222c4f3c7b13d07083823ef8fc | commitdiff |
| parent | e5ea08f01b7e9075dde7ee7887b84cb752e2d8e2 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
Conflicts:
doc/org.texi
| doc/org.texi | diff1 | diff2 | blobhistory |