tree 2c2cf4f544781e6bf502fae21d112d18c8349fdc
parent a43efe060df9196bd1aecdd37aa6e828a7a0a484
parent 7ec10c1640fd072cabc985dc42c2b176a0439ddf
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1377551441 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1377551441 -0700

Merged hyracks master back into VXQuery branch.