Merge branch 'master' of orgmode.org:org-mode
commitad640ce11524c55a091b83dd55bb2d8021e091a6
authorBastien Guerry <bzg@altern.org>
Fri, 29 Aug 2014 08:34:50 +0000 (29 10:34 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 29 Aug 2014 08:34:50 +0000 (29 10:34 +0200)
tree12036a29c618b28b4e977d0af23ebe2037458aa3
parent27533656d7aa9eccea0ca19dc2b822dd29568e17
parent851b779d1a3780d921b9c37b81a6afd919f2c479
Merge branch 'master' of orgmode.org:org-mode