tree eb8983652afd09b587582cc2dcd781741a564123
parent 3425fd2c70c41a7c860d115e5d520186ed4def5d
parent a6aa30ad0df4ea0ba52d178be2f7b8c2a07f70e0
author icetindil <icetindil@gmail.com> 1391200583 -0800
committer icetindil <icetindil@gmail.com> 1391200583 -0800

Merge branch 'master' of https://code.google.com/p/asterixdb into icetindil/issue_703