Merge branch 'maint'
commitab3f45cece895aca0a934dec3004119c7ce0da0a
authorBastien Guerry <bzg@altern.org>
Thu, 16 May 2013 08:33:42 +0000 (16 10:33 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 16 May 2013 08:33:42 +0000 (16 10:33 +0200)
tree3f56c0e3c050ffcd80f9148ddddecc21e961a0b6
parent15baadd8af24dafd922115b0aab7f3392a920f24
parentb83c0309a7ecb86251451557a12e451fe9f93b11
Merge branch 'maint'
lisp/org.el