| commit | 5e11659e66845e918a047f4a89d171f599729174 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 26 Jan 2013 14:11:21 +0000 (26 15:11 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 26 Jan 2013 14:11:21 +0000 (26 15:11 +0100) | ||
| tree | 73df3ce9c6fc767b4d8b3bf2253f5f73e03170eb | treesnapshot (tar.gz zip) |
| parent | 714b3722784364f34dbb9a8b28039938806726aa | commitdiff |
| parent | a1196499237b6a0389fba2d21b69c34068404519 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |