Public Git Hosting - ikiwiki.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b3f7c6a 18bb93f)

commit	0ae1e4cc0e598eacfeb508d11db81c33169631fd
author	Joey Hess <joey@kitenet.net>
	Mon, 29 Nov 2010 18:43:57 +0000 (29 14:43 -0400)
committer	Joey Hess <joey@kitenet.net>
	Mon, 29 Nov 2010 18:43:57 +0000 (29 14:43 -0400)
tree	f779fd1bd4b4eaae315473ea70f9c1e85a7981d1	tree \| snapshot (tar.gz zip)
parent	b3f7c6a9a579208f555a9ae7a409474d68897d04	commit \| diff
parent	18bb93f5744c1b57b929d9f8a6042e51fc5256f0	commit \| diff

Merge remote branch 'smcv/ready/localurl'

IkiWiki.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/rename.pm	diff1 \|	diff2 \|	blob \| history

A wiki which has a git backend