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

author	François Boulogne <fboulogne sciunto org>
	Sun, 4 Aug 2013 21:33:43 +0000 (23:33 +0200)
committer	François Boulogne <fboulogne sciunto org>
	Sun, 4 Aug 2013 21:33:43 +0000 (23:33 +0200)
commit	0212ad593a1c8ac2fba06f1020d9d11d8eb91a44
tree	0abae2bd25ff46908f7f838b4612204f84bb5832	tree \| snapshot
parent	d980e3fdc8a0ea173734235f024141d0181ccdc9	commit \| diff
parent	635ec6afeb7cafcab98fe27fa0386760a2f5c2f0	commit \| diff

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