tree bd2ffb6ad224e8ac92adbd56a9634f1e805edeb9
parent fcd965630d4452d96e99faa2b4258ed77711e966
author Ryan Ollos <rjollos@apache.org> 1374132670 +0000
committer Ryan Ollos <rjollos@apache.org> 1374132670 +0000

Merged [1504226] and [1504317] from trunk to 0.6 branch.

git-svn-id: https://svn.apache.org/repos/asf/bloodhound/branches/0.6@1504381 13f79535-47bb-0310-9956-ffa450edef68