Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 22:54:12 +0000 (23:54 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 22:54:12 +0000 (23:54 +0100)
commitab17f9959eaa22d23f066a36cb26eb2d8ba54bd4
treea262c1dfebd81c441d915d72378b7b8c0ac6a361
parent56b47cd0fe2c2cba246e475b44e5d0fb6fb8ea26
parentfd0380b52fdde98820c0ac8e21a39d8ed61ae671
Merge branch 'maint'
lisp/org.el