From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 22 Jul 2008 17:17:04 +0000 (-0400)
Subject: Merge commit 'origin/master' into tova
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a759a864f37925e6788980ac53bd8f7c69172635;p=jelmer%2Fikiwiki.git

Merge commit 'origin/master' into tova
---

a759a864f37925e6788980ac53bd8f7c69172635