Merge branch 'maint'
commit88555aab22f079042121e402c84e5ed166252452
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:54:47 +0000 (23 17:54 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:54:47 +0000 (23 17:54 +0100)
tree29e2edf1698994c0c9dd7e022bec78a5d7f5ae16
parentae7516b0e1a98b2c3a2d2d88b38e91e8e01926e1
parent98a5f3df328d883c43081d565d91edf3f29648da
Merge branch 'maint'
lisp/org.el