Merge remote-tracking branch 'XTUPLE/4_7_x' into gary23507
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Sat, 30 Aug 2014 04:21:54 +0000 (00:21 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Sat, 30 Aug 2014 04:21:54 +0000 (00:21 -0400)
1  2 
foundation-database/manifest.js

Simple merge