Merge branch 'master' of orgmode.org:org-mode
commitc189850bb1c5dfebc0c1966342c8a81e28654ec4
authorBastien Guerry <bzg@altern.org>
Sat, 31 May 2014 12:32:17 +0000 (31 14:32 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 31 May 2014 12:32:17 +0000 (31 14:32 +0200)
treecf0406b9f2a2698fe5b096082bdd2143dcf09f44
parent75ca2a0e0d31aa2443bb3aba11b5851c5e6b9bdd
parent857222323b9a6271bfd05ba3d024d5d372464045
Merge branch 'master' of orgmode.org:org-mode