]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/po' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:54:03 +0000 (11:54 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:54:03 +0000 (11:54 +0100)

Trivial merge