| commit | b48da0158d2d69f66eda0f0cee0139b79175a210 | |
| author | Christian Egli <christian.egli@sbs.ch> | |
| Thu, 18 Apr 2013 10:24:32 +0000 (18 12:24 +0200) | ||
| committer | Christian Egli <christian.egli@sbs.ch> | |
| Thu, 18 Apr 2013 10:24:32 +0000 (18 12:24 +0200) | ||
| tree | a1b3652b94e85458eb4b2919f698e9967d94a7e8 | treesnapshot (tar.gz zip) |
| parent | 4b5b117ad412da48fda0a7b8dead559f2786a210 | commitdiff |
| parent | ccdfa8ddf8c1e7ae438a3f3df6927f1026baf5c0 | 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.