Merge branch 'maint' of orgmode.org:org-mode into maint
commitecbd57effb7f0cac556eccac62a5d4bac8366815
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:11 +0000 (29 11:10 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:11 +0000 (29 11:10 +0200)
treebd0fb65d0152977640b64f55cbceb281bf0c493d
parent33213dc99a7ff72936023d1d3369b94b3eaeadee
parente6228c448e84f64ced8c48d13aa13881466fae8d
Merge branch 'maint' of orgmode.org:org-mode into maint