Merge branch 'master' of orgmode.org:org-mode
commitdb5881f33e70a79803818a3210d7b0d5d376f50d
authorBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 05:40:05 +0000 (15 06:40 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 05:40:05 +0000 (15 06:40 +0100)
tree604624f2b7cbcee3146b4f717fd62562e5b377ae
parentbeea46fab570e4307c2ccfbbc692033f4f4fadf9
parente556812db52232e1333f62834c465eaac4019491
Merge branch 'master' of orgmode.org:org-mode