tree 60475206c38c0e29a091788c1af7c9fef32a2bac
parent d48eba1afa60e9f6e3345b0692ff7ff46e0b6a55
parent f4b2f75c5445d772af44c846b093af46c31328f7
author buyingyi <buyingyi@gmail.com> 1369983741 -0700
committer buyingyi <buyingyi@gmail.com> 1369983741 -0700

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