Merge branch '4_7_x' of https://github.com/xtuple/xtuple into 22351-MultipleSitesInPo...
authorjulesstp <julianmcarlin@gmail.com>
Wed, 27 Aug 2014 15:19:44 +0000 (11:19 -0400)
committerjulesstp <julianmcarlin@gmail.com>
Wed, 27 Aug 2014 15:19:44 +0000 (11:19 -0400)

Trivial merge