Merge branch '4_6_x' of https://github.com/xtuple/xtuple into issue23878
authorGil Moskowitz <gmoskowitz@xtuple.com>
Mon, 14 Jul 2014 12:58:03 +0000 (08:58 -0400)
committerGil Moskowitz <gmoskowitz@xtuple.com>
Mon, 14 Jul 2014 12:58:03 +0000 (08:58 -0400)
commit99482f2e7cf2f60781c7c4cce1b76eaa15ccaf13
tree71c3eacc9cefd9a3077f57c46e4900f1e56add24
parent8dc32ae766f76a04d30f1464f26068afc1fdfc58
parent5b49e8ec59d807ebada35427c80fbf6e25786f32
Merge branch '4_6_x' of https://github.com/xtuple/xtuple into issue23878

Conflicts:
foundation-database/manifest.js
foundation-database/manifest.js