Merge branch 'master' of github.com:webnotes/erpnext into edge

website/templates/html/product_in_list.html

@@ -6,7 +6,7 @@
 		{% include 'html/product_missing_image.html' %}
 		{% endif %}
 	</div>
-	<div style="height: 80px; overflow: hidden; font-size: 80%;">
+	<div style="height: 100px; overflow: hidden; font-size: 80%;">
 		<h4 style="margin-bottom: 2px;"><a href="{{ page_name }}">{{ item_name }}</a></h4>
 		<p class="help">Item Code: {{ name }}</p>
 	</div>

website/templates/pages/attributions.html

@@ -11,8 +11,7 @@
 {% set title="ERPNext - Web Based, Open Source ERP" %}
 
 {% block content %}
-<div class="layout-attributions">
-	<div class="layout-main">
+<div class="layout-attributions span12">
 	<h3>This website is made using these Awesome Open Source Projects <i class="icon-heart" style="color: red"></i></h3>
 	<hr>
 	<table class="table table-bordered table-striped">
@@ -105,6 +104,5 @@
 	</table>
 
 	<p class="alert">Note: A link to this page must be easily accessible.</p>
-	</div>
 </div>
 {% endblock %}