From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Thu, 12 Dec 2013 18:52:27 +0000 (-0500)
Subject: Merge remote-tracking branch 'trunk'
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/e1b59b02e02ef1b397d3c09c633f83c5a83af5fb?hp=-c

Merge remote-tracking branch 'trunk'
---

e1b59b02e02ef1b397d3c09c633f83c5a83af5fb