Merge branch 'maint'
commit02078833e0521e301e44813cef60c20d239808a8
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 11:23:27 +0000 (4 12:23 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 11:23:27 +0000 (4 12:23 +0100)
tree159e966833170dc2c37b9bc89bba92b50adcea94
parent7e1ea27e783e3fadb9c3cc83b0c4d4c0b98aaa4c
parent44acd0004998c9dc6f876c6d02685ab1de8557b3
Merge branch 'maint'
lisp/org.el