| commit | 03920a01fa12091dd6df892c26f836743cd5560f | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 18 Apr 2013 10:28:03 +0000 (18 12:28 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 18 Apr 2013 10:28:03 +0000 (18 12:28 +0200) | ||
| tree | 6897d204c098ba7e27b59b89948bc78f614adca6 | treesnapshot (tar.gz zip) |
| parent | ccdfa8ddf8c1e7ae438a3f3df6927f1026baf5c0 | commitdiff |
| parent | bf29482973408b4a9c94e13e4c320e4c55b29490 | commitdiff |
Merge branch 'master-apply-aaron-patch2'
Conflicts:
lisp/ob-core.el
Conflicts:
lisp/ob-core.el
| lisp/ob-core.el | diff1 | diff2 | blobhistory |