Merge branch 'master' into json-reborn
[nit.git] / LICENSE-BSD
2012-02-14 Jean Privatupdate NOTICE and LICENSE