From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 23:44:40 +0000 (-0400)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 3.20100515~43
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8e50e00d25d321a8689051f7ab7452311c3925d5?hp=--cc

Merge remote branch 'origin/master'
---

8e50e00d25d321a8689051f7ab7452311c3925d5