Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim

.bzrignore

@@ -1,15 +0,0 @@
-.*
-*.egg-info
-*.orig
-*.vim
-build/
-RE:^bin/
-RE:^dist/
-RE:^include/
-
-RE:^share/
-RE:^man/
-RE:^lib/
-
-RE:^addons/\w+/doc/_build/
-RE:^.*?/node_modules

.gitignore

@@ -0,0 +1,28 @@
+# sphinx build directories
+_build/
+
+# dotfiles
+.*
+# compiled python files
+*.py[co]
+# setup.py egg_info
+*.egg-info
+# emacs backup files
+*~
+# hg stuff
+*.orig
+status
+
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
+
+# various virtualenv
+/bin/
+/build/
+/dist/
+/include/
+/lib/
+/man/
+/share/
+/src/