Merge branch 'maint'
commitba44fab320158afb0f8ec737c20c8f147191da7d
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 2 Sep 2012 13:05:01 +0000 (2 15:05 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 2 Sep 2012 13:05:01 +0000 (2 15:05 +0200)
tree00b45c06d9a5c7d7d6296c22e68a3345830ea060
parentf43c8c8100470d9e92aafb58e53a8959c920c7af
parent8d599a4eb23f5ca60162965d5e78d8ad7afff0be
Merge branch 'maint'
lisp/org.el