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

Trivial merge