]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
projects / ikiwiki-pandoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d305f01 1eefbaa)
Merge branch 'master' of https://github.com/rburgoyne/pandoc-iki
authorRyan Burgoyne <rburgoyne@gecoinc.com>
Mon, 25 Feb 2013 20:32:42 +0000 (13:32 -0700)
committerRyan Burgoyne <rburgoyne@gecoinc.com>
Mon, 25 Feb 2013 20:32:42 +0000 (13:32 -0700)
1  2 
pandoc.pm patch | diff1 | diff2 | blob | history

diff --cc pandoc.pm
Simple merge