]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)
committerintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)

Trivial merge