tree 6a0fc7fde55f483d76caa031c02c58e50723cfdd
parent 879a80b1fd502f2648a08d48874c9614fe23767f
parent d11c61cd11ac34f98ee0627e3efcd22f03addcbf
author Till Westmann <till@westmann.org> 1381959784 -0700
committer Till Westmann <till@westmann.org> 1381959784 -0700

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