Merge branch 'maint'
commit3128edcbf8b5548bfef274524e64f3add6c4e11b
authorBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 21:29:42 +0000 (16 22:29 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 21:29:42 +0000 (16 22:29 +0100)
tree57af878420305dfedc1621b083955bc07a7463c1
parent5f095f59099e77eda5cf7cae64119f9f246c4c70
parentf8b15da24c1e4a052411ef53a483aadf5752d00e
Merge branch 'maint'
lisp/org.el