tree fd6c083f5d3b6f4239ba461c64d210868aa590fa
parent aaf36bb8d8961a4072174e1c1844129d3524773b
parent 20c5e432ac3741331d7a5f5cfd201641e7093180
author Till Westmann <till@westmann.org> 1376064410 -0700
committer Till Westmann <till@westmann.org> 1376064410 -0700

Merge branch 'yingyi/asterix_fix' of https://code.google.com/p/asterixdb into yingyi/asterix_fix