From: Joey Hess <joey@kitenet.net>
Date: Sun, 6 Nov 2011 19:57:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20111106~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bf8b3bc12abe9d763329a191bdb152b30978d2ef

Merge remote-tracking branch 'origin/master'
---

bf8b3bc12abe9d763329a191bdb152b30978d2ef