Merge branch 'master' of orgmode.org:org-mode
commit41eae9bd42ac815664f9fad9f9a3792a337489ab
authorBastien Guerry <bzg@altern.org>
Sat, 6 Sep 2014 08:47:11 +0000 (6 10:47 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Sep 2014 08:47:11 +0000 (6 10:47 +0200)
treed3cec3aa054a0bc75c0742046732b9b1db8738f7
parent0ba1b1ad6d3e5cc9998d9141e453567b0d70ce76
parentc235bd83d2aa7071e643d25735026638ca0d7973
Merge branch 'master' of orgmode.org:org-mode