RiotGames/berkshelf — pull request #334 by justincampbell (2013-02-05 20:11:30+00:00)
Title: Merge 1-1-stable into master

This backports the changes in 1-1-stable to master