[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20130927051709-qltvmcxbte3vjezv

diff --cc addons/website/static/src/xml/website.snippets.xml
index 5a1ad2d,085d6e4..987f824
--- 1/addons/website/static/src/xml/website.snippets.xml
--- 2/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@@ -789,4 -795,23 +795,22 @@@
          </section>
      </div>
  
+     <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
+         <div class='oe_snippet_thumbnail'>Parallax</div>
+         <section class="oe_snippet_body parallax_full oe_structure">
+             <div class="container">
+                 <div class="row">
+                     <div class="col-md-12 mt128 mb32">
+                         <h1 class="text-center">
+                             <b>Our References</b>
+                         </h1>
+                         <h3 class="text-center">
+                             More than 500 happy customers.
+                         </h3>
+                     </div>
+                 </div>
+             </div>
+         </section>
+     </div>
+ 
 -
  </templates>

diff --cc addons/website_hr/views/website_hr.xml
Simple merge