| commit | e5539d4d58ce6de191cf79b4f06a9559de1ee4c7 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 20 Dec 2012 14:54:52 +0000 (20 15:54 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 20 Dec 2012 14:54:52 +0000 (20 15:54 +0100) | ||
| tree | b77bc5ee54e9a855a1ce7d2b16d769ef5305bbd5 | treesnapshot (tar.gz zip) |
| parent | 5de94e46e46b37a7ec1ed486a6400f17d00bf611 | commitdiff |
| parent | 27bcf9a70b1137c88cf856719ab6fd74297286ef | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ob.el
lisp/org.el
Conflicts:
lisp/ob.el
lisp/org.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |