Merge branch 'develop'

Author: andersbryrup

os2web_meetings.info

@@ -3,7 +3,7 @@ description = Includes content types and views regarding Agenda import and prese
 core = 7.x
 package = OS2Web - Frontend
 php = 5.2.4
-version = 7.x-1.11
+version = 7.x-1.0-beta1
 project = os2web_meetings
 dependencies[] = autocomplete_deluxe
 dependencies[] = better_exposed_filters
@@ -33,7 +33,7 @@ dependencies[] = taxonomy
 dependencies[] = text
 dependencies[] = views
 dependencies[] = views_php
-datestamp = 1338117520
+dependencies[] = os2web_print_send_to_friend
 features[ctools][] = ds:ds:1
 features[ctools][] = page_manager:pages_default:1
 features[ctools][] = strongarm:strongarm:1
@@ -201,4 +201,3 @@ features[views_view][] = os2web_meetings_view_feeds
 features[views_view][] = os2web_meetings_view_feeds_list
 features[views_view][] = os2web_meetings_view_search
 features[views_view][] = os2web_meetings_view_latest
-timestamp = 1353326099

os2web_meetings.make

@@ -8,7 +8,17 @@ core = 7.x
 projects[os2web_qbrick][type] = "module"
 projects[os2web_qbrick][download][type] = "git"
 projects[os2web_qbrick][download][branch] = "develop"
-projects[os2web_qbrick][download][url] = "git://github.com/OS2web/os2web_qbrick.git"
+projects[os2web_qbrick][download][url] = "[email protected]:OS2web/os2web_qbrick.git"
+
+projects[os2web_print_send_to_friend][type] = "module"
+projects[os2web_print_send_to_friend][download][type] = "git"
+projects[os2web_print_send_to_friend][download][branch] = "develop"
+projects[os2web_print_send_to_friend][download][url] = "[email protected]:OS2web/os2web_print_send_to_friend.git"
+
+projects[os2web_print_send_to_friend][type] = "module"
+projects[os2web_print_send_to_friend][download][type] = "git"
+projects[os2web_print_send_to_friend][download][branch] = "develop"
+projects[os2web_print_send_to_friend][download][url] = "git://github.com/OS2web/os2web_print_send_to_friend.git"
 
 ;; Contrib modules below: