tree df1f5d231a12f7e546c6f8e6a145a23d7f958a16
parent 94dc9bd85a0df7b421d64d1a6c749b659c3d5e9c
parent c2fe0015a25e9ae03ca2524582e8a721f127062a
author icetindil <icetindil@gmail.com> 1369967569 -0700
committer icetindil <icetindil@gmail.com> 1369967569 -0700

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