Merge branch 'maint' of orgmode.org:org-mode into maint
commit8ac18f6d2237faa0cf39afd37c1a58e20b5a975a
authorBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 20:00:32 +0000 (10 21:00 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 20:00:32 +0000 (10 21:00 +0100)
treed6b5f9663ac09597c7b25992133e0852868a870c
parentbe63eb69050ce78b20f2c410eba8301fe1d460a2
parent8720c4980724229545755b08fbac1724cd2e74be
Merge branch 'maint' of orgmode.org:org-mode into maint