| commit | fa17bf12d5a04c811adb73918c711bd65de6c66c | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 21 Dec 2012 08:33:19 +0000 (21 09:33 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 21 Dec 2012 08:33:19 +0000 (21 09:33 +0100) | ||
| tree | 1ec2949ff5983e6c029acab1cd2f7da21079e7b3 | treesnapshot (tar.gz zip) |
| parent | 72c2dc07a8b3a6463145d323793a3bed01bdc5b6 | commitdiff |
| parent | 30922bd7e9a2a5ebf03ed0544bd9af6f9187d175 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ob.el
Conflicts:
lisp/ob.el
| lisp/org.el | diff1 | diff2 | blobhistory |