tree 260308fb08ca6805ab48209d078f46c7cc79d709
parent 9653e3ad9d1aac5bd90120c9f27dfbe63daa7408
parent 4855e7e1be57a649f81fdee098c9972f4f079488
author icetindil <icetindil@gmail.com> 1369876888 -0700
committer icetindil <icetindil@gmail.com> 1369876888 -0700

Merge branch 'master' of https://code.google.com/p/asterixdb into icetindil/issue_378