]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
1  2 
t/po.t

diff --cc t/po.t
Simple merge