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

author	François Boulogne <fboulogne sciunto org>
	Sun, 31 Jan 2016 20:30:21 +0000 (15:30 -0500)
committer	François Boulogne <fboulogne sciunto org>
	Sun, 31 Jan 2016 20:30:21 +0000 (15:30 -0500)
commit	27c25086ac6d99a017cc78b071dfe04c6c941c46
tree	5b920855edff1b829f010ab626fe637872ef996c	tree \| snapshot
parent	c689d762140e761e20517e005ffdf713391c25f6	commit \| diff
parent	067b2589f02ae3ac60becdd60f8b922d80e2086b	commit \| diff

Merge branch 'master' of github.com:sciunto-org/ikiwiki-pandoc