tree 5d586aba6888f7391152d1cf61ac0f7a70aee84f
parent ed499899bcca815b2cc66cd9def237b6cc8bf8e3
parent 8937e6ea375a87c051719945a509e3b2c5b41f08
author Zachary Heilbron <zheilbron@gmail.com> 1394137190 -0800
committer Zachary Heilbron <zheilbron@gmail.com> 1394137190 -0800

Merge branch 'master' into eugenia/black_cherry_stable

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