From: cash <cash.costello@gmail.com>
Date: Thu, 8 Dec 2011 23:24:29 +0000 (-0500)
Subject: Merge branch '1.8'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c6f8f70f0fd86edf35f6efdef08ff44cb0429778;p=lorea%2Felgg.git

Merge branch '1.8'
---

c6f8f70f0fd86edf35f6efdef08ff44cb0429778