tree eb74c333a5a3c81c340731a3d800957261385a00
parent 8dbf9dcb3f7fcab8163ceaba3b36998d85c99fc8
parent bec665ecfb1525167a2cfc9f4b14955889a754a8
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1369606804 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1369606804 -0700

Merge branch 'master' into eugenia/asterix_beta_examples

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java