projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 7f744c0 23f5874)
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 23:05:13 +0000 (00:05 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 23:05:13 +0000 (00:05 +0100)
Conflicts:

debian/control


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.