Merge branch 'master' of orgmode.org:org-mode
commit6e3c944764352f4548c02e583a5d7e428ba76c14
authorBastien Guerry <bzg@altern.org>
Wed, 22 Aug 2012 10:25:44 +0000 (22 12:25 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 22 Aug 2012 10:25:44 +0000 (22 12:25 +0200)
tree17cbe1fb7675943494bdb852f41705127b03dafe
parent53c230a9f612294360b606a50c0e974f54152e75
parenta273a37ce0d82162266a3e8d6abd42a4dd083bcb
Merge branch 'master' of orgmode.org:org-mode