Merge branch 'master' of orgmode.org:org-mode
commitb04e66a6f832aba3dc6cfd02784e9ff0f65d13e0
authorBastien Guerry <bzg@altern.org>
Thu, 27 Sep 2012 22:13:04 +0000 (28 00:13 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 27 Sep 2012 22:13:04 +0000 (28 00:13 +0200)
tree7c90a0008f3e0da8ae604392ea4c01e5679942f0
parent570083d2ad043dde96d85c84dbfbd81928747141
parent4fb4494e18189cac6fff773d9929a874a2b28ae1
Merge branch 'master' of orgmode.org:org-mode