[jackson-annotations] 166/207: Merge pull request #30 from alexbirkett/master

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-annotations.

commit c00a2ae1e0d87a687c8823c1ab31a00800cbbbaf
Merge: 94025be 71c9a1d
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Wed Mar 5 16:53:56 2014 +0000

    Merge pull request #30 from alexbirkett/master
    
    Added licence (Apache 2.0)

 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --cc README.md
index 481ded6,5e27183..cac073f
--- a/README.md
+++ b/README.md
@@@ -8,8 -8,10 +8,10 @@@ to the [Databind package](/FasterXML/ja
  Project contains versions 2.0 and above: source code for earlier (1.x) versions is available from [Codehaus](http://jackson.codehaus.org) SVN repository.
  Note that with version 1.x these annotations were part of the 'core jar'.
  
 -[Full Listing of Jackson Annotations](jackson-annotations/wiki/JacksonAnnotations) details all available annotations; [Javadocs](http://fasterxml.github.com/jackson-annotations/javadoc/2.1.1/) gives more details.
 +[Full Listing of Jackson Annotations](../../wiki/Jackson-Annotations) details all available annotations; [Javadocs](http://fasterxml.github.com/jackson-annotations/javadoc/2.2.0/) gives more details.
  
+ Project is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+ 
  -----
  
  ## Usage, general

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-annotations.git