Merge branch 'master' into westmann/nljoin
tree: cb03efc57a1b806ee47fc2457414674d9bf1e927
  1. .gitignore
  2. algebricks/
  3. hivesterix/
  4. hyracks/
  5. pom.xml
  6. pregelix/