Merge branch 'master' of orgmode.org:org-mode
commit9bc7f706392c3e795efd36810278d22f5112b310
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 23:29:31 +0000 (28 00:29 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 23:29:31 +0000 (28 00:29 +0100)
treee43ed12f3c9bd3814f4095cc9442252a53803bd7
parentffefa9ed8626afd14de5df616075ccbbb805ce41
parent302d3780ecc75575b3d09908c6d6acdfed611206
Merge branch 'master' of orgmode.org:org-mode