Merge branch 'maint' of orgmode.org:org-mode into maint
commit7efb9cb7ed4782c572a1a630b5b8cb7efa09b553
authorBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 09:19:14 +0000 (3 11:19 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 09:19:14 +0000 (3 11:19 +0200)
tree919d7b6cabcc2fd0e861272e402dff1f5f79e0bc
parent87208bdecd53ecaedf1a993855c2f1a9038b77f9
parent8d599a4eb23f5ca60162965d5e78d8ad7afff0be
Merge branch 'maint' of orgmode.org:org-mode into maint