tree 93e5eb51be084c0386a33f5290bfdefd2d5f5039
parent 7bc02614d37d65f44fd148e4c2a6d16f33ff5716
parent 1f82dcc411e561d9c1c4ab1bc47382c8d67fba39
author buyingyi <buyingyi@gmail.com> 1368334877 -0700
committer buyingyi <buyingyi@gmail.com> 1368334877 -0700

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