| commit | 3518403790f2f22779e50728234b2da5f1e84ce0 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 2 Jun 2014 13:57:41 +0000 (2 15:57 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 2 Jun 2014 13:57:41 +0000 (2 15:57 +0200) | ||
| tree | 149c5091d5ba2fce2be203beb1cc3df3adaf3a60 | treesnapshot (tar.gz zip) |
| parent | 024a05b4516d321b50abfc77516fdc175109a662 | commitdiff |
| parent | 89cb26ed175fc4893b4b07be4f71ff5a8b857e1a | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |