tree af3f62fbfed678ead275fea61bee1c4f084bbc86
parent 25cb8bffe7d7a95550f728b48e348309d1c94e6e
parent f253c8699876dea37d8d89daa3042f8058ada523
author zheilbron <zheilbron@gmail.com> 1370331160 -0700
committer zheilbron <zheilbron@gmail.com> 1370331160 -0700

Merge branch 'master' into zheilbron/asterix_issue470

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/file/IndexOperations.java
	asterix-common/pom.xml