From: intrigeri Date: Sat, 24 Jul 2010 09:19:28 +0000 (+0200) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Tag: 3.20100804~25^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f71e7f8f5a5c69753fb77c897d4446cdc23f856;p=ikiwiki.git Merge remote branch 'upstream/master' into prv/po --- 2f71e7f8f5a5c69753fb77c897d4446cdc23f856