Merge remote-tracking branch 'origin/master' into staging

2014-08-15 02:15:14 +02:00
parent 36bef2b267 785ed2b528
commit df7bc53606
61 changed files with 5206 additions and 529 deletions
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -184,6 +184,11 @@ rec {
    url = http://opensource.franz.com/preamble.html;
  };

+  lpl-102 = spdx {
+    shortName = "LPL-1.02";
+    fullName = "Lucent Public License v1.02";
+  };
+
  mit = spdx {
    shortName = "MIT";
    fullName = "MIT License";