Merge branch 'lorea-preprod' of gitorious.org:lorea/Elgg into lorea-preprod

42 files changed, 89 insertions, 45 deletions

diff --git a/.gitmodules b/.gitmodules
index 52a3b8733..39a2241e5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -142,3 +142,30 @@
 [submodule "mod/favorites"]
 	path = mod/favorites
 	url = git://gitorious.org/lorea/elgg-favorites.git
+[submodule "mod/elgg-ostatus"]
+	path = mod/elgg-ostatus
+	url = git://gitorious.org/lorea/elgg-ostatus.git
+[submodule "mod/elgg-webfinger"]
+	path = mod/elgg-webfinger
+	url = git://gitorious.org/lorea/elgg-webfinger.git
+[submodule "mod/beechat"]
+	path = mod/beechat
+	url = git://gitorious.org/lorea/beechat.git
+[submodule "mod/microthemes"]
+	path = mod/microthemes
+	url = git://gitorious.org/lorea/microthemes.git
+[submodule "mod/simplepie"]
+	path = mod/simplepie
+	url = git://gitorious.org/lorea/simplepie.git
+[submodule "mod/upgrade-tools"]
+	path = mod/upgrade-tools
+	url = git://gitorious.org/lorea/upgrade-tools.git
+[submodule "mod/livestream"]
+	path = mod/livestream
+	url = git://gitorious.org/lorea/livestream.git
+[submodule "mod/profile_widgets"]
+	path = mod/profile_widgets
+	url = git://gitorious.org/lorea/profile_widgets.git
+[submodule "mod/cic_theme"]
+	path = mod/cic_theme
+	url = git://gitorious.org/lorea/cic_theme.git
diff --git a/mod/admins b/mod/admins
-Subproject f4dc616708e41fa44dcb1e73e4fb399db596797
+Subproject 61a9024caf688ad51907f714537b5fd9c1d4eaa
diff --git a/mod/assemblies b/mod/assemblies
-Subproject a54ee0c378fa4f73f028594e3308af6a637c467
+Subproject e42eea3180ad62c2a3555aac95a48aacd0f1f76
diff --git a/mod/audio_html5 b/mod/audio_html5
-Subproject fdc3e162bb551ef0b5f961cef9ec838a38f672a
+Subproject d9b7710fab6ef2165e1372f719cbd1abd5db745
diff --git a/mod/beechat b/mod/beechat
new file mode 160000
+Subproject 98f73419a691c2664e51aad4b28ed477feaba8e
diff --git a/mod/cic_theme b/mod/cic_theme
new file mode 160000
+Subproject 04afb4203787947ed4dc1a4b220d83b8dfedad1
diff --git a/mod/crud b/mod/crud
-Subproject adcfcf64775dd0d139c9b1f60073ddf3835e91f
+Subproject 34103cefdddcf003bc83381d5ec44024fe68530
diff --git a/mod/custom_index_widgets b/mod/custom_index_widgets
-Subproject 5bfffd40e5649baed964c2fe7b6c7cb5e6a1257
+Subproject e657a8c940a08dbe90d8a53f88ff40aad7e7a72
diff --git a/mod/dokuwiki b/mod/dokuwiki
-Subproject 6d6a4cda5706342a9e041feda4c3b026feb9cdc
+Subproject fd7786f838496cb89abd4d0d145a4f0cac46651
diff --git a/mod/elgg-activitystreams b/mod/elgg-activitystreams
-Subproject f14a63462c8a84b2de7cedb73fb66086e01f8fb
+Subproject 9cbd21c3e2765c3c661a20ce0840b25eb8e1409
diff --git a/mod/elgg-ostatus b/mod/elgg-ostatus
new file mode 160000
+Subproject a1aecda2a2d1759cadb5f4492b7dd74adcff620
diff --git a/mod/elgg-push b/mod/elgg-push
-Subproject 547d938ad45967f22a57091a758f3834c786eae
+Subproject f62f0b8652c21a2b5168ecbee7608cdfff86426
diff --git a/mod/elgg-salmon b/mod/elgg-salmon
-Subproject 35e98c8aea7d313e0e97e6b51343dd1751bdb4b
+Subproject e9787cfd97369609eba094222cabb8768f2f434
diff --git a/mod/elgg-webfinger b/mod/elgg-webfinger
new file mode 160000
+Subproject f47662ccb5585b9cdfc95e01d5deec0d33df024
diff --git a/mod/elgg-xrds b/mod/elgg-xrds
-Subproject 641b4b0b949549835a825d93dedc1b8aa1dad8f
+Subproject 3c3f5a6ce23e77d777751371bed17f36baee92a
diff --git a/mod/elggman b/mod/elggman
-Subproject 89aefda120602142f983142dcf21e6927656eda
+Subproject 21ca84194e193d25be01d376ad0379239605266
diff --git a/mod/elggpg b/mod/elggpg
-Subproject c0361b9ad60cbb23bf0678df1d61053998ca348
+Subproject 7f7d268f5c9cf5aa892109c4d9e69f3da1565db
diff --git a/mod/etherpad b/mod/etherpad
-Subproject 22007e7cbe1eb196346f1a1fa7222f28b1592e6
+Subproject 6113e31960ddc64b712b57d0e885754aa6d3bc3
diff --git a/mod/event_calendar b/mod/event_calendar
-Subproject 49779a932de82bf4a9106d1bb373e9077f6f0bc
+Subproject b23e75b25f8db91bebf3a748a686e5a7e874753
diff --git a/mod/favorites b/mod/favorites
-Subproject 8e505784f427e1ae7ed0e3c818157b95989bd6f
+Subproject 2c5a8a417cceb2cd1927df5500ff4ca678de27f
diff --git a/mod/federated-objects b/mod/federated-objects
-Subproject 72bbf4d52df679c38248951b5a09c4979e51ec7
+Subproject fb6a5c07acdd4c702480d513802cef611b13ed1
diff --git a/mod/group_alias b/mod/group_alias
-Subproject b9768dbfd90e9f3be6a86c8885dcafed95d9b49
+Subproject 66ed2dbdbe8d3357347a2a3f1298420ccd323ce
diff --git a/mod/group_operators b/mod/group_operators
-Subproject 64bd9f039265b434731cbe9730e265cdf7efb9e
+Subproject 8f8919e83272cb7c5e8e015bc78ec9e114bee11
diff --git a/mod/languages b/mod/languages
-Subproject dc25beb9cef75b97d09651bf93ea0a390795f02
+Subproject 335bc8bb5d6c16836de883dd2ae01e6a88f5748
diff --git a/mod/lightpics b/mod/lightpics
-Subproject 164bc4a97c103a2f1b96b88f18d909915b34f05
+Subproject c11fa1708b9d133c7efe9ca889ff0d9b8017119
diff --git a/mod/linkup b/mod/linkup
+Subproject 1ae3435df4fdfcdeaee9c41560ea356ef4ee23c
diff --git a/mod/livestream b/mod/livestream
new file mode 160000
+Subproject 89d1f3877f241f34e3ed3baad3c9ee9a4fee79e
diff --git a/mod/microthemes b/mod/microthemes
new file mode 160000
+Subproject ac6d17431ebce5f4f2d000ca2e3cc9c4cfa321d
diff --git a/mod/n1_theme b/mod/n1_theme
-Subproject 1ad82d4657bb4ce678f437f135bae2803bb80d8
+Subproject 87683e1a7c4ab2521fcd84228b4e720d388bb60
diff --git a/mod/openid_client b/mod/openid_client
-Subproject 0b21941bed977701ab2d7be6a91711901ac0299
+Subproject cc75bdf9ef06e0bd408b877b2f7dd14a04588ee
diff --git a/mod/openid_server b/mod/openid_server
-Subproject 0b8b67d74a51586c5a45012e9e0f7bbe54f7e95
+Subproject bc0ed096c45e6dd3b31859cb8adc577b6a548d3
diff --git a/mod/profile_widgets b/mod/profile_widgets
new file mode 160000
+Subproject fa825c5d41abf52153c50137d31dfc086c9f154
diff --git a/mod/proposals b/mod/proposals
-Subproject f4f28af850a4833eafeb671b102ffdc8f624ad6
+Subproject ae9b646a9154a82918d4b6482305b736c3e458e
diff --git a/mod/relatedgroups b/mod/relatedgroups
-Subproject 2ee34f77f40a59a2d3e36930f43ada8a67f49a9
+Subproject ab6fd383c34959666756abcb43a9b6c4c7eaf4d
diff --git a/mod/river_privacy b/mod/river_privacy
-Subproject 9c543bc93cf31e7368a5be1c6b53b7099b28191
+Subproject 4a8f3623c5d15543cc08ab93a245d612fa09c3f
diff --git a/mod/simplepie b/mod/simplepie
new file mode 160000
+Subproject b771ec72f82124d142f2e1d49c842a171ced562
diff --git a/mod/spotlight b/mod/spotlight
-Subproject 7874cd2d54b818167469b6629f5b336a89b7a9a
+Subproject 8a48163d7f7d781255098c1278f1f91c0cb32aa
diff --git a/mod/subgroups b/mod/subgroups
-Subproject 46a4a7e5f0971a615755f17d4656b233c58247d
+Subproject 11ab637a431a0a0a8fc68302b7c83faee029e9a
diff --git a/mod/tasks b/mod/tasks
-Subproject 1097a366fd12e3a95deff13dfeb785e8a0ecf41
+Subproject 0140e1e4eb0d94aefe60ec425b1465dbee714d0
diff --git a/mod/threads b/mod/threads
-Subproject 8280f7f61442614341e8a9c1661dacd323a3e48
+Subproject eeabbfc0f70ef4c08e5b3c6f3228c83645505a5
diff --git a/mod/upgrade-tools b/mod/upgrade-tools
new file mode 160000
+Subproject cce83f92ace326eb6482ef370dbdca02573d43e
diff --git a/mod/videolist b/mod/videolist
-Subproject c02bb30c3539587511bd866efbb00ce33b0ba85
+Subproject 22d34250d0f9d19c9da0c1c5742466f0b516284