Merge pull request #1684 from xtuple/4_5_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Sat, 19 Jul 2014 02:23:39 +0000 (22:23 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Sat, 19 Jul 2014 02:23:39 +0000 (22:23 -0400)
4 5 x

1  2 
foundation-database/manifest.js

Simple merge