tree c8ef599764ad058889d4ce6873133edceb87d291
parent 5264c79724cdcba22b3f2ae6eb619fc76aa6505e
parent 68e3a5a93c1ca8842b4e6a5861adae6660bf8d56
author zheilbron <zheilbron@gmail.com> 1376600239 -0700
committer zheilbron <zheilbron@gmail.com> 1376600239 -0700

Merge branch 'master' into dev/asterix_msr

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java