tree dfdce60fae4938caf9170437ccda80d7ffee3784
parent dd4b2d7e5f6e7d895ae4a5a9b48307d8b30a002d
parent c31b7e72de27af77d09d72e53de3236207a82659
author Pei Li <lpgdsxyz@gmail.com> 1386896489 -0800
committer Pei Li <lpgdsxyz@gmail.com> 1386896489 -0800

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