tree fbcf3c0c4ea4cc1d4146114646701af58f694562
parent a16c9ec3b27737509f810a5f82db8220271d293e
parent 648d11e62a828feffbccaff09163becbafe0d228
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1375308041 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1375308041 -0700

Merge branch 'master' into ecarm002/vxquery_compatibility