From: Joey Hess <joey@kitenet.net>
Date: Sat, 2 Jun 2012 01:32:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120629~51
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/aa9c867061dd11022853aaef711452aee80905f5

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

aa9c867061dd11022853aaef711452aee80905f5