angular/angular.js — pull request #2362 by patrickkettner (2013-04-11 05:16:30+00:00)
Title: fix for #2361

removed merge conflict comment in angular-mocks.js