tree aa6ac552ce17900d388406c383339c3b66064504
parent 3c364b79dd2901392364efb8312b19fc7d6bee45
parent b46d5391b2ea348245245044b6bb19f71f6cb3ef
author zheilbron <zheilbron@gmail.com> 1369872656 -0700
committer zheilbron <zheilbron@gmail.com> 1369872656 -0700

Merge branch 'master' into zheilbron/hyracks_asterix_issue470