Merge branches 'maint' and 'master' of orgmode.org:org-mode
commit40bd21611922d130ce02c0e93e6b442c28f8acdf
authorBastien Guerry <bzg@altern.org>
Mon, 5 Mar 2012 20:10:22 +0000 (5 21:10 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 5 Mar 2012 20:10:22 +0000 (5 21:10 +0100)
treecfc923d54437ab268dd02dd3b8a5959d05c8559b
parent0630d89a0c4c40b0f5913fc855632abe0669259e
parent93ad1e4c9a4cecc0ec4121fbac74a4bc5ce6ca6e
Merge branches 'maint' and 'master' of orgmode.org:org-mode