]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 21add7f)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 30 Dec 2008 17:24:36 +0000 (18:24 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 30 Dec 2008 17:24:36 +0000 (18:24 +0100)
Conflicts:

debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>

No differences found
wiki compiler