| commit | 5bf928bae7beda83d47301e1bec08a67a33a4766 | |
| author | Achim Gratz <Stromeko@Stromeko.DE> | |
| Wed, 28 May 2014 14:15:47 +0000 (28 16:15 +0200) | ||
| committer | Achim Gratz <Stromeko@Stromeko.DE> | |
| Wed, 28 May 2014 14:23:08 +0000 (28 16:23 +0200) | ||
| tree | 7610427d9d3c15a7df7c9b61c5588f1f5628197d | treesnapshot (tar.gz zip) |
| parent | b8eb1e40f68093ab49a0686d48cd7102787429af | commitdiff |
| parent | 3d973cdc6eff3f07dbe938ab1c59727aefd6c03e | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ob-core.el
lisp/org.el
lisp/ox.el
Conflicts:
lisp/ob-core.el
lisp/org.el
lisp/ox.el