From: Joey Hess Date: Thu, 27 Aug 2009 23:44:17 +0000 (-0400) Subject: Merge commit 'remotes/github/pedigree' into slop X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8cfba729702e52ba2b3716d7a2d2daaff61a1604?hp=-c Merge commit 'remotes/github/pedigree' into slop --- 8cfba729702e52ba2b3716d7a2d2daaff61a1604