projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d48cbc 35204a8)
Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)

Trivial merge
Org-mode, an Emacs mode for organizing your life.