Merge branch 'master' of orgmode.org:org-mode
commit7dc4d7cebc1c10a6433a9645edf88078853da60b
authorBastien Guerry <bzg@altern.org>
Fri, 10 Aug 2012 08:13:03 +0000 (10 10:13 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 10 Aug 2012 08:13:03 +0000 (10 10:13 +0200)
tree7806f57dbf7dceb1fa3f8d146eed70d15889ae7f
parent068a354747f0829a0d1652a79dfa00433e60fa87
parent1e73d2bbc3ce635928ddd234d16ac9332460aa72
Merge branch 'master' of orgmode.org:org-mode