Switching to the 2-clause BSD license - aka the FreeBSD license.
Switching to the 2-clause BSD license - aka the FreeBSD license.

git-svn-id: 86a4f41f9d0383640198789122b520d4105b319a@11971 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

Turbo87/mergejs.py