Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 09:26:03 +0000 (10:26 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 09:26:03 +0000 (10:26 +0100)
commit7773e0d94cb19f57a762303fe0a0549a52c99f08
treec4da0b57bff4704991660c4acd028da201a85978
parent197881bc1a68072ea866276c90a4fa0e33e1a34d
parentaa3786bc20b03cb81f8af4734f367afadb685941
Merge branch 'maint'
lisp/org.el