Merge branch 'maint'
commitf01ce8502673c739bcb0da3c43ba1d2bdba7e203
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:25:38 +0000 (24 01:25 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:25:38 +0000 (24 01:25 +0100)
tree546cc6bb9b08b1c6d2268c4f88ee8043a906488b
parentf0b35a637989e2bbd1ac2eff7f69ce1f8169903d
parent40cb44e79517e85799f6f05c550bc83d55c971ee
Merge branch 'maint'
lisp/org.el