From: Svend Sorensen <svend@ciffer.net>
Date: Mon, 19 Apr 2010 23:13:10 +0000 (-0700)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20100427~105^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/65510a3c05fec6008587b0379911314c6cfacd19?hp=65510a3c05fec6008587b0379911314c6cfacd19

Merge branch 'master' of git://git.ikiwiki.info
---