]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)

Trivial merge