From: cash <cash.costello@gmail.com>
Date: Thu, 8 Dec 2011 23:22:45 +0000 (-0500)
Subject: Merging 1.8 into master. This syncs the branches to recover from the cherry picking
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=19a8af878b74dd9e840fb45c1be4c3a61e93cd64;p=lorea%2Felgg.git

Merging 1.8 into master. This syncs the branches to recover from the cherry picking
---

19a8af878b74dd9e840fb45c1be4c3a61e93cd64