From: Joey Hess <joey@kitenet.net>
Date: Sat, 5 Nov 2011 18:47:18 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/cc7acaecaebf3fe50f295a40b75cf602faf6f209?hp=-c

Merge branch 'master' of ssh://git.ikiwiki.info
---

cc7acaecaebf3fe50f295a40b75cf602faf6f209