Merge branch 'master' of github.com:xtuple/xtuple into server-npm-integration
authorTravis Webb <me@traviswebb.com>
Fri, 20 Jun 2014 06:17:58 +0000 (02:17 -0400)
committerTravis Webb <me@traviswebb.com>
Fri, 20 Jun 2014 06:17:58 +0000 (02:17 -0400)

Trivial merge