Merge branch 'maint' of orgmode.org:org-mode into maint
commit2a04d90d204f5aacfc10410b3546078b6cdd9c2b
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 07:38:34 +0000 (29 09:38 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 07:38:34 +0000 (29 09:38 +0200)
tree3088e69b55e6c44140069547e818fc2e538332c8
parent22c308083098f98a46bf2e752e005a9c36618b54
parent9c92312d927314699c72fc17f23e01bcef75601f
Merge branch 'maint' of orgmode.org:org-mode into maint