projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc5be82 0978be7)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 23:32:10 +0000 (00:32 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 23:32:10 +0000 (00:32 +0100)
1  2 
debian/copyright patch | diff1 | diff2 | blob | history

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