Merge branch 'maint'
commit59468ab2d85a9e53320c09310051bcf2a6c0ac1a
authorKyle Meyer <kyle@kyleam.com>
Sat, 31 Oct 2015 16:49:59 +0000 (31 12:49 -0400)
committerKyle Meyer <kyle@kyleam.com>
Sat, 31 Oct 2015 16:49:59 +0000 (31 12:49 -0400)
treeb4479b5300363c1161662bffb024af1874ad51ce
parent0b78c71cd5337bf44a8e9933fe65c2ab74109fcc
parent59d706219bf0434cceacda18e3d291c241648199
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el