| commit | 830e231ef1da5c5a1ab760a6a059551841952610 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 21 Dec 2012 08:46:49 +0000 (21 09:46 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 21 Dec 2012 08:46:49 +0000 (21 09:46 +0100) | ||
| tree | 0f34cba159502a4b9f9a5930f8a764d2d01744d1 | treesnapshot (tar.gz zip) |
| parent | fa17bf12d5a04c811adb73918c711bd65de6c66c | commitdiff |
| parent | 9333426c123b092e76b319a112063602936c2575 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ob.el
testing/lisp/test-org-src.el
Conflicts:
lisp/ob.el
testing/lisp/test-org-src.el