Merge branch 'maint'
commit8cee987f79dcdff38c969cdf80db6c2c6826af5c
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 15:16:09 +0000 (20 16:16 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 15:16:09 +0000 (20 16:16 +0100)
treeddb905376a9b46c2ac819fd263a5a01ad1dbe8d5
parentfeacde6c71b5dbab0fa944c97e58f5097849b15f
parente89994a75c691f9d68cf94bbfaa8db42771db937
Merge branch 'maint'
lisp/org.el