tree 6e88d230fd0e8774e2e0c37b4d1f80a6b340a922
parent 43137a409f642ac03dd3b2055b1e64354d76e9b3
parent 1ac2408859eed6a1efa75ff8777e86ef53c64e64
author Pei Li <lpgdsxyz@gmail.com> 1385539702 -0800
committer Pei Li <lpgdsxyz@gmail.com> 1385539702 -0800

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