tree fc5e821f854faae8a3b48ea5529b6c1cb43e69e5
parent 6ba382dcfb2ea743ab024210914e3294b97fae86
parent 91505ba2eea2a8e958f1cd3368264e64e1d4faed
author Eugenia Gabrielova <genia.likes.science@gmail.com> 1369265309 +0000
committer Eugenia Gabrielova <genia.likes.science@gmail.com> 1369265309 +0000

Merge branch 'eugenia/web_ui_beta_fixes' of https://code.google.com/p/asterixdb into eugenia/web_ui_beta_fixes

Conflicts:
	asterix-app/src/main/resources/webui/querytemplate.html