tree c84712b383a3e4313ed1205bcbbdb7fa28cd0364
parent a6f5aad91f7c58a7e38be5589218160bc92b9a71
parent 9ae8d0a35259741519cc0a0f972182a9c9e79c08
author icetindil <icetindil@gmail.com> 1399458901 -0700
committer icetindil <icetindil@gmail.com> 1399458901 -0700

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