| commit | 9a466f2f05e8ad737f20d045fec056fd9c836f7f | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 26 Jan 2013 09:59:12 +0000 (26 10:59 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 26 Jan 2013 09:59:12 +0000 (26 10:59 +0100) | ||
| tree | 5396d0df44c027d6811fb72fd6f0b04b60af0c6a | treesnapshot (tar.gz zip) |
| parent | 61078b4ed415e7b8b7ba28f325bef7c6f7a00dc2 | commitdiff |
| parent | 36dba0cf6e0f3d958aaff4e9df5a6977ee0953fa | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |