Merge branch 'master' of orgmode.org:org-mode
commit61ea363f052078392f58e02f22ef2cd15b722240
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:27 +0000 (29 11:10 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:27 +0000 (29 11:10 +0200)
tree77f298955da548a182f4cc1c80b2ce4c26f21ed4
parent4962980938c147086b2572e6392506e80a6b0994
parent9ab8cb1196f43b46f300e0b5aa9e79616ac4b4db
Merge branch 'master' of orgmode.org:org-mode