Merge remote branch 'upstream/master' into prv/po
[ikiwiki] / doc / quotes.mdwn
2009-11-07  Joey Hessadd