Merge branch 'maint'
commitb9676a25756338b6ce22b673e72bffcd4f157e9c
authorKyle Meyer <kyle@kyleam.com>
Wed, 28 Oct 2015 05:47:43 +0000 (28 01:47 -0400)
committerKyle Meyer <kyle@kyleam.com>
Wed, 28 Oct 2015 05:47:43 +0000 (28 01:47 -0400)
tree16af991068b9ecd67dd39de373605fb159ad1bbc
parent4552a8915b412f6fc8c96345b312d107eb214da6
parent1c740023f7856ad01bcbdfd54f04f0ed448a9aee
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el