tree 22f301c842b8d079ad7b11895eb87078519b0ecd
parent 319e0f43da2d8f6168408067c3aabaddd69a1f68
parent cdc9e2cd6fe3a5639fc18ad7bcb8ae143c08426e
author Anand Doshi <anand@erpnext.com> 1367212341 +0530
committer Anand Doshi <anand@erpnext.com> 1367212341 +0530

Merge branch 'edge'

Conflicts:
	home/page/latest_updates/latest_updates.js