Merge branch 'master' into 22155
authorJohn Rogelstad <john@xtuple.com>
Tue, 31 Dec 2013 13:58:50 +0000 (08:58 -0500)
committerJohn Rogelstad <john@xtuple.com>
Tue, 31 Dec 2013 13:58:50 +0000 (08:58 -0500)
commit62ea7c2614090c938181ac98791d5da1dfbe6ccb
tree529148bf90d85e60eb98674b0e1657af6a6315b2
parenta76d8d84f7d94fd2a47dde57b6ddf5b4b7910401
parent31b994e51e5d83959cc959df58928252099c3931
Merge branch 'master' into 22155
enyo-client/application/source/en/strings.js
enyo-client/application/source/models/item_site.js
enyo-client/application/source/models/sales_order_base.js
enyo-client/application/source/views/list.js
enyo-client/application/source/widgets/parameter.js
enyo-client/database/source/manifest.js
lib/enyo-x/source/en/strings.js
lib/enyo-x/source/views/list.js