| commit | 570e30b5ddc302a3fe77071f47acbba6038b74d4 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 14 Aug 2012 10:02:03 +0000 (14 12:02 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 14 Aug 2012 10:02:03 +0000 (14 12:02 +0200) | ||
| tree | 4907d69db952ed164f2f18ece782d349221eb45e | treesnapshot (tar.gz zip) |
| parent | a4f5e94dc8495c64e1834615f63793b7be326aef | commitdiff |
| parent | 16a2203f6f97a0afc7277cc4459817d2e79195d8 | commitdiff |
Merge branch 'master' of orgmode.org:org-mode
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.