From: Steve Clay <steve@mrclay.org>
Date: Wed, 5 Dec 2012 21:22:09 +0000 (-0500)
Subject: Merge branch '1811' into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d;p=lorea%2Felgg.git

Merge branch '1811' into 1.8
---

ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d