commit | eedcc40a7ebdfbd58744c22e3897d0a4588e3a69 | [log] [tgz] |
---|---|---|
author | Till Westmann <till@westmann.org> | Tue May 28 14:09:46 2013 -0700 |
committer | Till Westmann <till@westmann.org> | Tue May 28 14:09:46 2013 -0700 |
tree | 0bbc951636c2a6711d40f2803760dc807800cd41 | |
parent | ec9816c46c48c61dcda3fc75ca1f27885db38fc0 [diff] | |
parent | 46071bde8b06d63cbf10a704d30a1a6f2e83d842 [diff] |
Merge branch 'chenli/master/wiki_changes' of https://code.google.com/p/asterixdb into chenli/master/wiki_changes