git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff

]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff

projects / git.ikiwiki.info.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 204c0a6 e3ea28f)

author	Joey Hess <joey@kitenet.net>
	Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -0400)
committer	Joey Hess <joey@kitenet.net>
	Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -0400)

		1	2
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

Unnamed repository; edit this file 'description' to name the repository.