tree b9671005ad6b75a3802a2680f45e6e1e36bb6e13
parent dcda88b3fea6f1e0e915f5731d24ea805eb5f911
parent a01dfb2be34414124eb470893a1a2d4edb4250c6
author icetindil <icetindil@gmail.com> 1369696408 -0700
committer icetindil <icetindil@gmail.com> 1369696408 -0700

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