Merge branch 'maint'
commit4adf17f81193f6f0fdfac93875975d0a2f91752b
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 23:08:20 +0000 (24 00:08 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 23:08:20 +0000 (24 00:08 +0100)
tree6dbf27399060dd549b7efe2f3e5e15c71bf66013
parent88555aab22f079042121e402c84e5ed166252452
parent73d506a8dc01819fd0cf0a110788d8e8ae55ef36
Merge branch 'maint'
lisp/org.el