Merge branch '4_7_x' of https://github.com/xtuple/xtuple into i24559_xtlocks
authorGil Moskowitz <gmoskowitz@xtuple.com>
Wed, 17 Sep 2014 21:10:31 +0000 (17:10 -0400)
committerGil Moskowitz <gmoskowitz@xtuple.com>
Wed, 17 Sep 2014 21:10:31 +0000 (17:10 -0400)
commit6f3e82ba3f1b8ec449de7b2d7154eddb55a0be6b
treeed3ab53f1ff3113e5111e863b732ce29211909aa
parent878495eac6191e6ebefdcbb3fa7b3377c9637fc1
parent8c5b966332a20878a9f3a63711f35da1dfe5a5a3
Merge branch '4_7_x' of https://github.com/xtuple/xtuple into i24559_xtlocks
and change language of wipe_views to allow building a database

Conflicts:
enyo-client/database/source/delete_system_orms.sql
enyo-client/database/source/delete_system_orms.sql
enyo-client/database/source/wipe_views.sql
scripts/lib/build_database.js