projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc3b08b db71a9b)
Merge commit 'origin/debian-testing' into debian-testing
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 8 Sep 2008 15:51:25 +0000 (11:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 8 Sep 2008 15:51:25 +0000 (11:51 -0400)
1  2 
debian/changelog patch | diff1 | diff2 | blob | history

diff --cc debian/changelog
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.