From: Steve Clay <steve@mrclay.org>
Date: Wed, 22 Aug 2012 15:45:15 +0000 (-0400)
Subject: Merge branch 'steve-4543' into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=693e6f296d98a63b5b2a14dea5c0829bb9c5ccf0;p=lorea%2Felgg.git

Merge branch 'steve-4543' into 1.8
---

693e6f296d98a63b5b2a14dea5c0829bb9c5ccf0