]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 01:04:22 +0000 (21:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 01:04:22 +0000 (21:04 -0400)
commit85ec27ab5822d67788a6d13255d4929a789c4435
treefaeaea185eee3756198ed6f00dc5cb54500b5ee8
parent2bfbad7af4e3e09287b4c06c958d0929c0c7bc63
parent0651e86a4c3e6f038b1362e33ea08235f046c102
Merge branch 'master' into tova

Conflicts:

debian/changelog
debian/changelog