Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in
This commit is contained in:
Moises Silva committed 2011-06-16 13:43:37 -04:00
commit 2a9046fdb8
608 files changed
+33546 -20511

No files matched your search

+1 -1
View File
@@ -1,3 +1,3 @@
en-us-callie 1.0.16
ru-RU-elena 1.0.12
ru-RU-elena 1.0.13