# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: http://bzr.savannah.gnu.org/r/librejs/dev/
# testament_sha1: d44e263c15656de612387e25cbf0ac082cbc1e31
# timestamp: 2014-12-02 10:40:46 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'data/script_libraries/script-libraries.json'
--- data/script_libraries/script-libraries.json	2014-12-02 04:56:17 +0000
+++ data/script_libraries/script-libraries.json	2014-12-02 09:40:01 +0000
@@ -334,12 +334,12 @@
 
     "0b327b43256da9f57b78e3134aaecc2a4a5a3bad": {
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.js",
-        "result": "[freelib]",
-    }
+        "result": "[freelib]"
+    },
     "01100f829bce3f074adcb6ae5309d9e769ef29fe": {
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js",
-        "result": "[freelib]",
-    }
+        "result": "[freelib]"
+    },
     "5f99079e4564f94a1d5e45d22d6dc18acbb148da": {
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.21/jquery-ui.js",
         "result": "[freelib]"
@@ -1477,26 +1477,35 @@
 
     "5ada7c103fc1deabc925cc1fdbbb6e451c21fc70": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
     },
     "afa7af2bc7cbe37eeccb9b65577744c08219c5a9": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
     },
     "5814e91bb6276f4de8b7951c965f2f190a03978d": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
     },
     "fd607f85d598503b24d7799722db29fec4de1ef6": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
     },
     "c6a8a0f02ee0ecd975226ae4b38e9660750d1f93": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
     },
     "539e456bb40d9e98244060186f5f131b1a7f4b33": {
         "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.js",
-        "result": "[freelib"]
+        "result": "[freelib]"
+    },
+
+    "128273a9c66a32d7d59a6f290deb6cc4a2b2ee5a": {
+        "filename": "http://cdnjs.cloudflare.com/ajax/libs/lightbox2/2.7.1/js/lightbox.min.js",
+        "result": "[freelib]"
+    },
+    "250d7c160f17c13e89cee0e1dcd1debb2e940ed2": {
+        "filename": "http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js",
+        "result": "[freelib]"
     }
 }

# Begin bundle
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
bQH/F3JFOFCQeP01Mg==