projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dbe055 bbea8d3)
Merge branch 'master-new-features'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (12:06 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (12:06 +0100)

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