Merge branch 'maint'
commitd09088ca179dbbd784f64cf368ab35ae0b6531ce
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 14:05:13 +0000 (4 15:05 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 14:05:13 +0000 (4 15:05 +0100)
tree89291b825671e350915975a24cb0d8cb232b1099
parentc36ab62b11092f7e1846ce85f4d103037d692411
parent45b0d23b0c3c9e4f488658a2102685a93c1ee842
Merge branch 'maint'
lisp/org.el