tree 49506e904be522e9b33fa0df5e1dfe2f810f8ae8
parent c5f82a262bd9b97d8f3469c38a9c4fc134f42681
parent 8a6f94d304bb2fe582b3efbab2663daf2a75af7b
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1368007675 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1368007675 -0700

Merge branch 'master' into eugenia/asterix_beta_examples

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/RESTAPIServlet.java