From: Joey Hess <joey@kitenet.net>
Date: Fri, 6 May 2011 18:31:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'jonas/master'
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/18322db430bf8799af69827d0c8359a3b747e9a9

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

18322db430bf8799af69827d0c8359a3b747e9a9