RiotGames/berkshelf — pull request #481 by reset (2013-05-01 00:09:29+00:00)
Title: Lockfile 2.0 - cleaned branch

this branch remedies a merge conflict from #363. See #363 for full details.