tree c0dc9849f23c12afc29e7c5d7eaa7e0d5c96e3d9
parent 04374e9163fb31aea7bb231300d0732e362d516d
parent 6f95cab356da3d24b65111b1e9048572721e9bc3
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1383265254 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1383265254 -0700

Merged hyracks master back into VXQuery branch.