Merge branch 'master' of orgmode.org:org-mode
commit435e633b6ac3951eb202c1a3f27cffb87c921834
authorBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 23:22:04 +0000 (29 00:22 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 23:22:04 +0000 (29 00:22 +0100)
tree59a9124752ffd51c52913f4c1c1ed10aac285f80
parentbb28480169558a183fab2330476a49b4fb1aec46
parent9fb3e136d8dadab0af8d94bc343871fb378dee6f
Merge branch 'master' of orgmode.org:org-mode