Merge branch '4_5_x' of github.com:xtuple/xtuple into server-npm-integration
authorTravis Webb <me@traviswebb.com>
Fri, 13 Jun 2014 20:50:14 +0000 (16:50 -0400)
committerTravis Webb <me@traviswebb.com>
Fri, 13 Jun 2014 20:50:14 +0000 (16:50 -0400)
commit3588c7c2634cb79944c90fad17b574d821e4eaf5
treebd7a56170982735a5cd9f72971fa56eea12d5a51
parent4dbdc96149a6b75a71cc6526ced5d1e30b42cfd2
parent36a17dcaeb03a984add917a03a561d1152372075
Merge branch '4_5_x' of github.com:xtuple/xtuple into server-npm-integration

Conflicts:
npm-shrinkwrap.json
package.json
package.json
test/lib/zombie_auth.js