Merge branch 'dev'

candy-chat · Nov 30, 2011 · e7b86b6 · e7b86b6
2 parents cf253c9 + cd75c63
commit e7b86b6
Show file tree

Hide file tree

Showing 22 changed files with 463 additions and 232 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "libs/jquery-i18n"]
 	path = libs/jquery-i18n
-	url = git://github.com/recurser/jquery-i18n.git
+	url = git://github.com/mweibel/jquery-i18n.git
 [submodule "libs/strophejs"]
 	path = libs/strophejs
 	url = git://github.com/amiadogroup/strophejs.git

diff --git a/Makefile b/Makefile
@@ -6,8 +6,8 @@
 # (c) 2011 Amiado Group AG
 #
 # Authors:
-#   - Patrick Stadler <patrick.stadler@amiadogroup.com>
-#   - Michael Weibel <michael.weibel@amiadogroup.com>
+#   - Patrick Stadler <patrick.stadler@gmail.com>
+#   - Michael Weibel <michael.weibel@gmail.com>
 #
 
 SHELL=/bin/bash