Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Catherine Taylor 2013-08-15 16:35:56 +01:00
commit a30bf907a4

View File

@ -1,4 +1,4 @@
This project is licensed under the permissive [ISC license](http://www.isc.org/software/license). Parts imported from other projects remain under their respective licenses: This project is licensed under the permissive [ISC license](http://www.isc.org/downloads/software-support-policy/isc-license/). Parts imported from other projects remain under their respective licenses:
- [autolink-js by Bryan Woods; MIT](https://github.com/bryanwoods/autolink-js) - [autolink-js by Bryan Woods; MIT](https://github.com/bryanwoods/autolink-js)
- [load.js by Chris O'Hara; MIT](https://github.com/chriso/load.js) - [load.js by Chris O'Hara; MIT](https://github.com/chriso/load.js)