Merge branch 'maint'
commitda83bf584d782a879b33184f7adbe8eac5d089fb
authorBastien <bzg@gnu.org>
Sun, 16 Aug 2015 13:15:09 +0000 (16 15:15 +0200)
committerBastien <bzg@gnu.org>
Sun, 16 Aug 2015 13:15:09 +0000 (16 15:15 +0200)
treed8557e15b5cdbdd04436dc290030ff38343a2a90
parentd25d9fd4475aa0790e4df2941b6a570b4887b0bd
parentc27c101fa3ea4f8c8169a5ec52beb2b188aeb6b5
Merge branch 'maint'
lisp/org.el