From: Joey Hess <joey@kitenet.net>
Date: Sun, 3 Jun 2012 17:15:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/mirrorlist'
X-Git-Tag: 3.20120629~49
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/32f3b4de00b1d2c4e3bfd7eca63f5ebbd4501ae7

Merge remote-tracking branch 'intrigeri/mirrorlist'
---

32f3b4de00b1d2c4e3bfd7eca63f5ebbd4501ae7