Merge branch 'master' into master-da - syncing with master-da where provided

8 files changed, 6 insertions, 0 deletions

diff --git a/.gitmodules b/.gitmodules
index 9f71e50..526a65f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,9 @@
 [submodule "perl"]
 	path = perl
 	url = git://source.jones.dk/ikiwiki.new/perl
+[submodule "attachment"]
+	path = attachment
+	url = git://source.jones.dk/ikiwiki/attachment
+[submodule "jquery"]
+	path = jquery
+	url = git://source.jones.dk/ikiwiki/jquery
diff --git a/attachment b/attachment
new file mode 160000
+Subproject 101beb116501b49d69c158413037601ae4f2203
diff --git a/basewiki b/basewiki
-Subproject a9401df39eaf0e9bfaa1e88591209df00ea78c1
+Subproject c3390aa6cbb6738a980cfd819ca9d4c953016aa
diff --git a/jquery b/jquery
new file mode 160000
+Subproject f08360530a2e8feb2248b5248da07eb936fe4c3
diff --git a/openid-selector b/openid-selector
-Subproject 7afa5e6bbd99e0015fa9727bf6ca70434cbdcd2
+Subproject f832ce33462ebcb5cc31ac657f4e28192a02f30
diff --git a/perl b/perl
-Subproject a9d9b21ce6006936d640fe1098cb1e5312a51aa
+Subproject 8f93aadfc79c538d151259bae2172578b7af4a2
diff --git a/templates b/templates
-Subproject 1c6b6c784f1daa63b824f4d12ca11d2c7faa8ca
+Subproject f6c0a30ee8b3f228cca9e4e67ce745056336f7a
diff --git a/themes b/themes
-Subproject d4c46a494494e7ee6f18f4b6f5b8389b51246d6
+Subproject 287b354ae989eb94c272156d539d9a32672c4c4