tree 67953e65d8853de31411dacb2ebd70564c7a3636
parent 2adfb82e38079a2964bfb33a711b0597b51ea775
parent 6d57e1aea2e9726a3e8aefdf67d36da0cfbe3d3d
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370468306 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1370468306 -0700

Merge branch 'eugenia/asterix_sdk_stable' of https://code.google.com/p/asterixdb into eugenia/asterix_sdk_stable