tree 0f98ab491ca3287c037454a917f56b80fa4c8b70
parent a7023ecbf75db738a12163e6f6187cc7740c6cca
parent a1f2c5c6a6d4916ae513b710ddd74fcf468c5fa7
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1383336598 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1383336598 -0700

Merged hyracks master back into VXQuery branch.