tree 387cdf0650d40031645f73d7993d16b055690567
parent 2140d47345a50a705683b3c4b493f70c1dc47a53
parent ce7523f34b9b2b18c76490ffbb832a54603f7a55
author Seth Falcon <seth@opscode.com> 1365790713 -0700
committer Seth Falcon <seth@opscode.com> 1365790713 -0700

Merge branch 'jc-thread-safe-bcrypt'