tree 8677ea99e4bacbf88aa733056bfd9d968defcaad
parent 832c88d568e23fd3638127c4e29e4d76b3cb785b
parent 31a29b74b2afd45d6e0f0910d55818252260bed0
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1382121725 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1382121725 -0700

Merged hyracks master back into VXQuery branch.