Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 14:54:42 +0000 (15:54 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 14:54:42 +0000 (15:54 +0100)
commite800105122dacedcd818250dca35f51720ff5465
treead61e0d95e6ff947c52f4a3529de9f60670e44dc
parentce8706f26899ecdc3af176de64235b456cc17f0d
parent181abcaf2923170a8c6d65842ba9f0fef308a111
Merge branch 'master' of orgmode.org:org-mode