| commit | 56470de26df3fd6813df3246287ef7f6c5581b7b | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Fri, 12 Oct 2012 16:22:04 +0000 (12 18:22 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Fri, 12 Oct 2012 16:22:04 +0000 (12 18:22 +0200) | ||
| tree | 6b903d98a996e7bbb062df0d058df84bbe5bb621 | treesnapshot (tar.gz zip) |
| parent | 9b11e63e7a465a1fcd71c442a299480e568751a8 | commitdiff |
| parent | 5212d4fa6bb0039f6cfc5166f02be57106ee7e16 | commitdiff |
Merge branch 'maint'
Conflicts:
testing/lisp/test-org.el
Conflicts:
testing/lisp/test-org.el
| lisp/org.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-org.el | diff1 | diff2 | blobhistory |