Merge branch 'maint'
commit7384c96954409e00d6f1590cef4d0e082fc34443
authorBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 11:12:37 +0000 (23 13:12 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 11:12:37 +0000 (23 13:12 +0200)
treee71768ca50f743f626bcbe8314cdc6c2cf6c2fed
parentc23d9ee8c54912745e0a84f4d4f7ade26924bc3a
parentfe0057556b991f29288b211a3f7fa40292d2cf60
Merge branch 'maint'
lisp/org-mouse.el
lisp/org.el