tree 536dd3723a5379d009e74bcb5b87b30e7e918721
parent 78f2984a6ca17520198e5ec8afb18bef8d0e7c6e
parent 212e24297ae1b609919f3de000090e21129b41a4
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370468237 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370468237 -0700

Merge branch 'master' into eugenia/asterix_sdk_stable

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