Merge branch 'maint' of orgmode.org:org-mode into maint
commit9488d1309484a05b612d84f4a334219d44f93b21
authorRasmus <rasmus@gmx.us>
Mon, 23 May 2016 07:06:56 +0000 (23 09:06 +0200)
committerRasmus <rasmus@gmx.us>
Mon, 23 May 2016 07:06:56 +0000 (23 09:06 +0200)
tree9a378f1147ca60ece2964aac84b14cae0b22d074
parent8c968a9697580361ff19159bab60df132ab1bbd5
parent6105643903b5933508f5aa296663136ec2e7ba4b
Merge branch 'maint' of orgmode.org:org-mode into maint