From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 20:10:57 +0000 (-0500)
Subject: Merge remote branch 'remotes/GiuseppeBilotta/master'
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/5b152d2fefeac63008b4bfd381fe599b853c035a

Merge remote branch 'remotes/GiuseppeBilotta/master'
---

5b152d2fefeac63008b4bfd381fe599b853c035a