tree b89b9ac94c70454149fc2a4860c1a27d8b1c0fca
parent 199361e10d6ccdd2ebbed22d8f8d9d1e00a98f6a
parent 212e24297ae1b609919f3de000090e21129b41a4
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370465107 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370465107 -0700

Merge branch 'master' into eugenia/asterix_beta_examples

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