projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef003f4 f7ded11)
Merge commit 'upstream/master' into pub/po
authorintrigeri <intrigeri@boum.org>
Thu, 21 May 2009 07:15:55 +0000 (09:15 +0200)
committerintrigeri <intrigeri@boum.org>
Thu, 21 May 2009 07:15:55 +0000 (09:15 +0200)
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.