]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)

Trivial merge