Merge branch 'maint'
commit188dc72b2d66391a3539b71604e4b595e33c9f72
authorBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 15:24:09 +0000 (29 17:24 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 15:24:09 +0000 (29 17:24 +0200)
treeee7d845d5dda272e50a9236a234a9630b1dbfb3c
parent24aa4ab127a50c45c4688bc5b3b603bb87b6b54f
parentc18468798f577fad8db2befcda5c0c7a127452c6
Merge branch 'maint'
lisp/org.el