local commit
fix conflict
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #16 from lynnaloo/master

Updated README with new documentation standard. Added Vmware Fusion support.
Merge pull request #22 from xtuple/4_5_x

4 5 x
Updated Vagrantfiles
Merge remote-tracking branch 'origin/master'
fixed Vagrantfile
Merge pull request #28 from lynnaloo/master

Changes to Vagrantfile to support haxTuple/demo
Merge remote-tracking branch 'XTUPLE/4_6_x'
working development environment with updated documentation to follow
update Vagrantfile
update Vagrantfile
Merge pull request #29 from gpazo/qtdevtools

Qtdevtools
Merge pull request #30 from xtuple/4_6_x

4 6 x