Merge branch '4_6_x' of https://github.com/xtuple/xtuple into 4_6_x
authorjulesstp <julianmcarlin@gmail.com>
Fri, 1 Aug 2014 20:17:20 +0000 (16:17 -0400)
committerjulesstp <julianmcarlin@gmail.com>
Fri, 1 Aug 2014 20:17:20 +0000 (16:17 -0400)

Trivial merge