From 6cae659abbb28d7b6d63f18ad36591f1522826c8 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 4 Feb 2013 09:32:07 +0100
Subject: [PATCH] Merge branches 'edge' and 'edge' of
 github.com:webnotes/erpnext into edge