Merge remote-tracking branch 'XTUPLE/4_7_x' into fixPreReq
authorGreg Pazo <gpazo@xtuple.com>
Mon, 29 Sep 2014 20:05:45 +0000 (16:05 -0400)
committerGreg Pazo <gpazo@xtuple.com>
Mon, 29 Sep 2014 20:05:45 +0000 (16:05 -0400)

Trivial merge