From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 13 Sep 2010 00:25:51 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20100915~16^2~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9ab56b4ec8c99127afa74cbd3dac7f1f2fcae8d9?hp=9ab56b4ec8c99127afa74cbd3dac7f1f2fcae8d9

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