]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'prv/po' into pub/po
authorintrigeri <intrigeri@boum.org>
Mon, 3 Nov 2008 00:35:58 +0000 (01:35 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 3 Nov 2008 00:35:58 +0000 (01:35 +0100)

Trivial merge