| commit | 2da8a36229d536c24bf64b4205231f70817569a0 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 3 Apr 2012 07:46:34 +0000 (3 09:46 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 3 Apr 2012 07:46:34 +0000 (3 09:46 +0200) | ||
| tree | dc394849908796782ce6aa7c08c6159c0177a4c2 | treesnapshot (tar.gz zip) |
| parent | 3b0463554226953268e747377abc099b8f3c9783 | commitdiff |
| parent | a8c68023455a3a83d26661dd13ce6aeaab270d56 | commitdiff |
Merge branch 'hotfix'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |