From: Steve Hackbarth <stephenhackbarth@gmail.com>
Date: Wed, 17 Sep 2014 15:43:05 +0000 (-0400)
Subject: merge
X-Git-Tag: v4.7.0-beta.2~7^2
X-Git-Url: http://git.roojs.org/?p=xtuple;a=commitdiff_plain;h=04173279f1465375f8b6abe9c33cd3dd5eedee00

merge
---

04173279f1465375f8b6abe9c33cd3dd5eedee00