]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:24 +0000 (22:19 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:24 +0000 (22:19 +0100)

Trivial merge