projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 204c0a6 e3ea28f)
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -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.