Merge lp:~openerp-dev/openobject-server/trunk-survey2-rim into lp:openobject-server

[Thibault Delavallée (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-survey2-rim]

5187. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-10

[MERGE] Sync with trunk

5188. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-10

[MERGE] Sync with trunk

5189. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-11

[MERGE] Sync with trunk

=== modified file 'openerp/addons/base/module/module_data.xml'
--- openerp/addons/base/module/module_data.xml	2013-08-11 13:58:37 +0000
+++ openerp/addons/base/module/module_data.xml	2014-04-11 11:57:48 +0000
@@ -85,12 +85,6 @@
             <field name="sequence">11</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_survey">
-            <field name="name">Survey</field>
-            <field name="description">Lets you create, send, share and answer to surveys.</field>
-            <field name="sequence">11</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_marketing">
             <field name="name">Marketing</field>
             <field name="description">Helps you manage your marketing campaigns step by step.</field>