From: Brett Profitt <brett.profitt@gmail.com>
Date: Sun, 16 Dec 2012 22:32:01 +0000 (-0500)
Subject: Merge branch 'pr-309' into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cc0f1ddad2fac1d1761d59a818f1c41d7db6ed0d;p=lorea%2Felgg.git

Merge branch 'pr-309' into 1.8
---

cc0f1ddad2fac1d1761d59a818f1c41d7db6ed0d