Merge branch 'master' of orgmode.org:org-mode
commit9c6495760932aa243433334039a8616a174cd03d
authorBastien Guerry <bzg@altern.org>
Mon, 6 Oct 2014 12:25:40 +0000 (6 14:25 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 6 Oct 2014 12:25:40 +0000 (6 14:25 +0200)
tree247513e32864b6187ea53385eb204f507d2674f3
parente81b911c46e59b6698d05677e8acad4264855186
parentb54ad32a795edf57d84259d453be23aede638c70
Merge branch 'master' of orgmode.org:org-mode