tree c63fa4cd50bbdc91cea5011f27728727f4a32c67
parent 4de48d210c1c366f5b79601e77421f6b30e5dd63
parent eedbf67bf94455fd5b7484b9b2abaa53299617c0
author Joe Bowser <bowserj@apache.org> 1370378579 -0700
committer Joe Bowser <bowserj@apache.org> 1370378579 -0700

Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.8.x