tree a65786bc2caa8e586e3474dfa0f97102d1daa6cf
parent 52f3b38abdc6b9709c5ac07495dbd840300b670b
parent 9b7cd112203dc2fbe6fe422250f9afd4c8e431b0
author buyingyi <buyingyi@gmail.com> 1382429992 -0700
committer buyingyi <buyingyi@gmail.com> 1382429992 -0700

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