Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 22:49:16 +0000 (23:49 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 22:49:16 +0000 (23:49 +0100)
commitfb8ba17e69e1dfa8d06553bb5122abf849a6faf2
treee851b810c1cb6d2f1fd9acbebcd969e4062a3f5e
parent2718888f8e4afcbecb608539b3f16414a7399d3d
parenta9ece57df80ecf3172a1145284b899dbce56bded
Merge branch 'maint'
lisp/org.el