| commit | c9ce0cad11b547a987cb897771e6fa6333304ae1 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sun, 20 Apr 2014 06:01:14 +0000 (20 08:01 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sun, 20 Apr 2014 06:01:14 +0000 (20 08:01 +0200) | ||
| tree | 0b4c7a21120eb6a76464bb7bc3b18df3a1f650f8 | treesnapshot (tar.gz zip) |
| parent | 57039a54aa2fe2ed8849a045326caca89d7bf1e6 | commitdiff |
| parent | 9272ef3e17278d1d46f56cda3459ce9d17dcc87d | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |