[MERGE]:Knowledge config

bzr revid: apa@tinyerp.com-20120731070558-vbiz2eepwo48f4fw

diff --cc addons/knowledge/res_config_view.xml
index 7eaa6ba,f9e0b7a..2aefb96
--- 1/addons/knowledge/res_config_view.xml
--- 2/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@@ -45,6 -31,19 +31,19 @@@
                              </div>
                          </div>        
                      </group>
+                     <group>
+                         <label for="id" string="Wiki"/>
+                         <div>
+                             <div>
++                                <field name="module_wiki_quality_manual" class="oe_inline"/>
++                                <label for="module_wiki_quality_manual"/>
++                            </div>   
++                            <div>
+                                 <field name="module_wiki_faq" class="oe_inline"/>
+                                 <label for="module_wiki_faq"/>
+                             </div>
 -                            <div>
 -                                <field name="module_wiki_quality_manual" class="oe_inline"/>
 -                                <label for="module_wiki_quality_manual"/>
 -                            </div>        
+                         </div>                           
+                     </group>
                  </form>
              </field>
          </record>