Merge branch 'maint'
commit040ec48a0df7d5b4c4db8aeb4a869ec9d3ffebe1
authorBastien Guerry <bzg@altern.org>
Tue, 18 Mar 2014 15:25:55 +0000 (18 16:25 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Mar 2014 15:25:55 +0000 (18 16:25 +0100)
treedca91040033dcd685d0a7e8cf5a92a105885e749
parentcdb16718c04446dea73cfc5111fb8f428622fb75
parent3a1a72f2f5582d01330d68675ade4612fe948a49
Merge branch 'maint'
lisp/org.el