From: Joey Hess Date: Sat, 17 Jul 2010 17:25:03 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100722~25 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9dd98cf945385b8a802e5f9d0ffb4041251c9fa;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- c9dd98cf945385b8a802e5f9d0ffb4041251c9fa