Merge branch 'maint'
commit791a8d6bcc68a1c5c7ba3389da4c7be844a118bc
authorBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (13 19:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (13 19:27 +0100)
tree1708a7986261499a6004c230064d4df4baeb00ba
parent127bffa9e9cfe525fad0d8c3a7fde050d21a06a6
parent6d7142b145d0398247a0dcd6cdec087693c08048
Merge branch 'maint'
lisp/org-mobile.el
lisp/org.el