From: Nick Bowler <nbowler@elliptictech.com>
Date: Fri, 20 Dec 2013 05:59:51 +0000 (-0500)
Subject: Merge branch 'emergent'
X-Git-Url: http://git.draconx.ca/gitweb/gentoo-draconx.git/commitdiff_plain/34141f985da505d571111a8c846ef2cefd99f766

Merge branch 'emergent'
---

34141f985da505d571111a8c846ef2cefd99f766