Merge branch 'maint'
commit9b4b890da271aad513b60e55b8e2c9f7f22bdbb9
authorBastien Guerry <bzg@altern.org>
Sun, 27 Jan 2013 08:21:47 +0000 (27 09:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Jan 2013 08:21:47 +0000 (27 09:21 +0100)
treea741a52301ffe979173e1767b576440dc53e47df
parentf52600a43908d5b246901780b9a761e477ec5604
parent08c2938e7db0ae65b104759d74d67566b0d5c66f
Merge branch 'maint'
lisp/org.el