| commit | ce2359eb80fc4a7c0398d34a4d7f7a9038e7c9f9 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 20 Jun 2014 06:44:06 +0000 (20 08:44 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 20 Jun 2014 06:44:06 +0000 (20 08:44 +0200) | ||
| tree | c7ba32116fffada5d844b344d66f8dbfbf752364 | treesnapshot (tar.gz zip) |
| parent | f336de2f822a882872c737d985c1d8f25b83358f | commitdiff |
| parent | 4b0557bdd807dbdc49e59d9f172092957f2e6074 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |