From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 19 Jul 2010 06:11:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20100722~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/194817b63d2241e8764f01ad64a2aaaa0b6bf5b3?hp=-c

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

194817b63d2241e8764f01ad64a2aaaa0b6bf5b3