Merge branch 'master-fixes'
commitf0b35a637989e2bbd1ac2eff7f69ce1f8169903d
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:15:57 +0000 (24 01:15 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:15:57 +0000 (24 01:15 +0100)
treebdaf939edc6e575ce2331a7189cb09c2e631cc69
parent51ad913982a4349840e2786472364370dae82e9f
parent5fa52d9a93000fa55b64061c24333c7fbe3ed236
Merge branch 'master-fixes'
lisp/org.el