Permalink
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
2 parents 4b97422 + 93dee3e commit b6eaf0b072eba665111b4cf96bdd52a1bd2379e4 @norv norv committed May 11, 2012
Showing with 25 additions and 0 deletions.
  1. +25 −0 DCO.txt
View
25 DCO.txt
@@ -0,0 +1,25 @@
+Developer's Certificate of Origin 1.1
+
+ By making a contribution to this project, I certify that:
+
+ (a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+ (b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+ (c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+ (d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.

0 comments on commit b6eaf0b

Please sign in to comment.