Merge branch 'maint'
commit692f053d8067e2314826cfcd3cf4ded7362a8dce
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 13:49:46 +0000 (27 14:49 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 13:49:46 +0000 (27 14:49 +0100)
tree2ca11119d3237b93d479ab45fc07a3f8708dd552
parentc8c991e049400ce943f3e0cbdfcacbf8e40938d7
parentc8c26c8e1968a4b341ae05046f33374ae5b08723
Merge branch 'maint'
lisp/org.el