]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)

Trivial merge