From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Mar 2011 18:12:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'levitte/master'
X-Git-Tag: 3.20110430~117
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/02d30b1552886540be94d5066e16c06f02e348d3?ds=sidebyside;hp=02d30b1552886540be94d5066e16c06f02e348d3

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