| commit | 627b3faa3d720ff02fa777c5fe74088fbf45dba3 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Jan 2013 12:57:57 +0000 (22 13:57 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Jan 2013 12:57:57 +0000 (22 13:57 +0100) | ||
| tree | 3e68747a39b9bc49647d7244f2464d3c59192d38 | treesnapshot (tar.gz zip) |
| parent | f7f1b4bb7eeeff603bdbeeea1b9da07809c13b5b | commitdiff |
| parent | a85b393994d9dcfe12a457c5c9dd62d9090bdb06 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |