Merge branch 'maint'
commitaf41c071edc45252aa7bfde4898e75a829a2b29d
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 10 Apr 2014 09:56:13 +0000 (10 11:56 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 10 Apr 2014 09:56:13 +0000 (10 11:56 +0200)
tree50d5a85d4ab5bc3c2bd4c4ee313f5d1817631a99
parent645384a03787823e596846ee728ecdf0dfc2882b
parent7fe1da1f8c5a8bc54806700ea135135912f8f504
Merge branch 'maint'
testing/org-test.el