[minor] merge master

stock/page/stock_ageing/stock_ageing.js

@@ -176,7 +176,8 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
 			xaxis: {  
 				ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }),
 				max: 20
-			}
+			},
+			series: { downsample: { threshold: 1000 } }
 		}
 	}	
 });

stock/page/stock_ledger/stock_ledger.js

@@ -235,6 +235,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
 				min: dateutil.str_to_obj(this.from_date).getTime(),
 				max: dateutil.str_to_obj(this.to_date).getTime(),
 			},
+			series: { downsample: { threshold: 1000 } }
 		}
 	},
 	get_tooltip_text: function(label, x, y) {