Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:25:28 +0000 (11:25 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:25:28 +0000 (11:25 +0200)
commit6e4ce7dc231c8615d33fb826e266ca4aaed44366
tree2f7d3e5b45ead03f8c82fb35bd0bf24306b5887f
parenta959d2320104747f1d34e22ce9b64acde71d18ec
parentaed8b7176fa4cb067b15d4facf9c6280f4807a95
Merge branch 'master' of orgmode.org:org-mode