Merge branch 'master' of orgmode.org:org-mode
commit43df5aa25ab8570d48740f69bba9dab9d062dcb3
authorBastien Guerry <bzg@altern.org>
Tue, 21 Aug 2012 16:16:11 +0000 (21 18:16 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 21 Aug 2012 16:16:11 +0000 (21 18:16 +0200)
treebd905b52018e015cdb7ca01934f51a82549121fb
parent6a69ceaed6875908844dbb8f28a19ce8301d5afd
parent7ff8c166e663872e4c1dd8c33771519800b3a8e9
Merge branch 'master' of orgmode.org:org-mode