]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'prv/po' into pub/po
authorintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 16:08:36 +0000 (17:08 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 16:08:36 +0000 (17:08 +0100)

Trivial merge