duojs/duo — pull request #367 by yields (2014-10-27 13:22:42+00:00)
Title: fix: require conflicts

cc @MatthewMueller @stephenmathieson