Merge branch 'master' of orgmode.org:org-mode
commit0c179218156c0c1323818e12e2401a860703738d
authorBastien Guerry <bzg@altern.org>
Fri, 18 May 2012 05:48:49 +0000 (18 07:48 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 18 May 2012 05:48:49 +0000 (18 07:48 +0200)
treeea0714d6e2372cb8968fe5390aa25c92d761701a
parent2369090328f9a2313d59a873c20f5ed229ffa3d0
parent5847931b371e189cda0f4dcca0a0be9815d5386f
Merge branch 'master' of orgmode.org:org-mode