]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'prv/po' into pub/po
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:35 +0000 (23:39 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:35 +0000 (23:39 +0100)

Trivial merge