Merge branch 'maint'
commitdb51b80d2be9cad8e0b8ae3752805a53ed1bd33b
authorBastien Guerry <bzg@altern.org>
Fri, 14 Dec 2012 09:34:49 +0000 (14 10:34 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Dec 2012 09:34:49 +0000 (14 10:34 +0100)
tree83e58f065bbacda40ebda7be58a053342ce7e8cc
parentb8662049e717f96152126ae097f969d387ce4cd9
parentdf099175e75368175c8c1132f5ac5b0207f02ab1
Merge branch 'maint'
lisp/org.el