Merge branch 'master' of orgmode.org:org-mode
commit13c481b5833d20c0518635fb5516c3f027e8183d
authorBastien Guerry <bzg@altern.org>
Sat, 2 Mar 2013 15:08:46 +0000 (2 16:08 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 2 Mar 2013 15:08:46 +0000 (2 16:08 +0100)
tree2349d5ef60749d707e9d36b9fedd56542f657159
parentbd89d6a02ff0d6400041e48b5d5d5f2f8dabc2d6
parent5a0239b9fc0124608964f8fe0370632c56659794
Merge branch 'master' of orgmode.org:org-mode