Merge branch 'maint'
commitc36ab62b11092f7e1846ce85f4d103037d692411
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:53:10 +0000 (4 14:53 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:53:10 +0000 (4 14:53 +0100)
tree9a46bfdf3269c69c13880aa8c82630d36b367ce6
parent31c5e3dc8c035689655bbad6bcc6adc4eedaa211
parent857cf28a90902cd0a37562a655e04c7387e01c45
Merge branch 'maint'
lisp/org.el