]> git.draconx.ca Git - gentoo-draconx.git/commitdiff
Merge branch 'emergent'
authorNick Bowler <nbowler@elliptictech.com>
Fri, 20 Dec 2013 05:59:51 +0000 (00:59 -0500)
committerNick Bowler <nbowler@elliptictech.com>
Fri, 20 Dec 2013 05:59:51 +0000 (00:59 -0500)

Trivial merge