Merge branch 'maint' of orgmode.org:org-mode into maint
commit92c8cd487dae0f00ad69c0c75bbc9d48153d73de
authorBastien Guerry <bzg@altern.org>
Thu, 27 Sep 2012 21:50:02 +0000 (27 23:50 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 27 Sep 2012 21:50:02 +0000 (27 23:50 +0200)
tree885013fabddf30afe2bbc7dfd81080b0a897d31e
parentb0c5030c8566e10af41543e8b52c0bdc1b01ea88
parent418ec0f5e7be3cda66b05c63d60c6633a244c587
Merge branch 'maint' of orgmode.org:org-mode into maint