diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 11:54:26 -0800 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 11:54:26 -0800 |
commit | f15965e205a5c11adca6b08c14c8fffccdcc9cc5 (patch) | |
tree | d7f6642f93c33d230e5e25b361b17c5f04db09a8 /changelog | |
parent | eac4abe36f705b852726eeceee928eb9ead6ceb0 (diff) | |
parent | 970f63c18a5caf2954e02200150a4bc051a74648 (diff) | |
download | pandoc-f15965e205a5c11adca6b08c14c8fffccdcc9cc5.tar.gz |
Merge branch 'master' into citeproc
Diffstat (limited to 'changelog')
0 files changed, 0 insertions, 0 deletions