From: Jonas Smedegaard Date: Sun, 19 Jul 2009 18:21:16 +0000 (+0200) Subject: Merge branch 'master' of git://git.ikiwiki.info X-Git-Tag: 3.15~163 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cccd4e101a13cb73d25d591ef6c23122ec15533e;p=ikiwiki.git Merge branch 'master' of git://git.ikiwiki.info --- cccd4e101a13cb73d25d591ef6c23122ec15533e