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

author	François Boulogne <fboulogne sciunto org>
	Sat, 4 May 2013 19:47:47 +0000 (21:47 +0200)
committer	François Boulogne <fboulogne sciunto org>
	Sat, 4 May 2013 19:47:47 +0000 (21:47 +0200)
commit	ea851582c4ad2002a761df7094610ca3ca84179f
tree	a8a1ea510d2a5cace7ee3ed86b7583f02567060d	tree \| snapshot
parent	e755639a97e72c170bde8318d8130eec3d2a7d1e	commit \| diff
parent	7ef0d3e4fa0e1dfc01b982c6f0ca5e25c1aaf6e3	commit \| diff

Merge remote-tracking branch 'rburgoyne/master'

Conflicts:
.gitignore
pandoc.pm