git.g-eek.se Git - ikiwiki-pandoc.git/commit

author	François Boulogne <fboulogne sciunto org>
	Sat, 4 May 2013 20:01:07 +0000 (22:01 +0200)
committer	François Boulogne <fboulogne sciunto org>
	Sat, 4 May 2013 20:01:07 +0000 (22:01 +0200)
commit	50527f0b085b0a73a1d48a07f33939efb2cbbfd1
tree	df8edd52f26d2c2db4ec8527d0d03a7867ac6ac2	tree \| snapshot
parent	cc3d427937554a1a92b035439fb4706df0b90223	commit \| diff
parent	86fff27e68acaeec193cbbd7001be3cd1f391d16	commit \| diff

Merge remote-tracking branch 'bk/master'

Conflicts:
pandoc.pm