Merge branch 'master' of orgmode.org:org-mode
commit402494fbd2ff2fbc23d44a8d21dd6e41e199d16c
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:15:00 +0000 (4 18:15 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:15:00 +0000 (4 18:15 +0100)
tree98a7d41d338c77d54284014423239b214e20443a
parent17c3091f15e4cc40d0b1d8e330dac7c39a485ba4
parent24ff7c648bd5f3a11d60c017b64c1170571d6920
Merge branch 'master' of orgmode.org:org-mode