Merge branch 'master' of orgmode.org:org-mode
commite4d196758b6c93f1fdac662245ea9705d454fb21
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 26 Feb 2016 19:00:43 +0000 (26 20:00 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 26 Feb 2016 19:00:43 +0000 (26 20:00 +0100)
tree24828de9c905dfb35d9e462bbba8d043482c6a68
parent28d3e729e48414410009831d2aa9aae95d13e3c4
parent1003b1025bdd86974c183f13fdbb0c500c484c75
Merge branch 'master' of orgmode.org:org-mode