Merge branch 'maint'
commit31c5e3dc8c035689655bbad6bcc6adc4eedaa211
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:49:07 +0000 (4 14:49 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:49:07 +0000 (4 14:49 +0100)
treed791977cd79186d185ccf69f44600cb8398d9139
parent7ef92ae1211504f2bd24fd51fd9f9e4e33ba2431
parent2aeb5f0cad84e1d2f481d30691e36c6bb1514d64
Merge branch 'maint'
lisp/org.el