Skip to content
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 0dce0f4 + fec2a9e commit af93fdca1aff2fee854d215a4c25d052328a83b3 @aehlke committed May 31, 2011
Showing with 26 additions and 0 deletions.
  1. +20 −0 LICENSE
  2. +6 −0 README.markdown
View
20 LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Levy Carneiro Jr.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
6 README.markdown
@@ -190,3 +190,9 @@ Adds new tag to the list.
* [Tobias Schmidt](http://github.com/grobie)
* [Skylar Challand](http://github.com/sskylar)
* [Alex Ehlke](http://github.com/aehlke)
+
+
+## License
+
+tag-it is released under the MIT license.
+

0 comments on commit af93fdc

Please sign in to comment.
Something went wrong with that request. Please try again.