Merge branch 'maint'
commitbf5f896bc2b7cff7559c7e803900be771159b8bd
authorBastien Guerry <bzg@altern.org>
Sun, 30 Jun 2013 23:16:48 +0000 (1 01:16 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 30 Jun 2013 23:16:48 +0000 (1 01:16 +0200)
treee2a70b64dc0781d1791f5333174b3cb97b4a41e2
parent2ccd6d98875c8d8d64ed00a8385f01bf883e8a50
parent5381ebd910e417571d0ce684f101c73132eb0fb8
Merge branch 'maint'
lisp/org.el