Merge branch 'maint'
commit74974ab34b7cf31add28cdb3f6d9fce8009eda34
authorBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 14:01:14 +0000 (3 16:01 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 14:01:14 +0000 (3 16:01 +0200)
treef6e90d1c4929dff39083cd0b4e37651d21052255
parent0b51434a010a151b2dcc4077496d459105ba9f92
parentf0c2a680568009ad2f93020af8134dbd481070e2
Merge branch 'maint'
lisp/org.el