tree 0bbc951636c2a6711d40f2803760dc807800cd41
parent ec9816c46c48c61dcda3fc75ca1f27885db38fc0
parent 46071bde8b06d63cbf10a704d30a1a6f2e83d842
author Till Westmann <till@westmann.org> 1369775386 -0700
committer Till Westmann <till@westmann.org> 1369775386 -0700

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