| commit | b54d6f5965a62c179f79a804efe4e4337c97b074 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 7 Jan 2013 15:19:37 +0000 (7 16:19 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 7 Jan 2013 15:19:37 +0000 (7 16:19 +0100) | ||
| tree | f85c680629c15d259d6a0120c23f52fd0797f38e | treesnapshot (tar.gz zip) |
| parent | 3a1c27060792fc095435efcaf270a6207d5d8d27 | commitdiff |
| parent | c8bfd50223d1a75d12d7f74571c24951592c56ec | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
lisp/org.el
testing/lisp/test-org-element.el
Conflicts:
lisp/org-agenda.el
lisp/org.el
testing/lisp/test-org-element.el