Anand Doshi 6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
..
2011-09-05 18:43:09 +05:30
2011-12-22 19:04:49 +05:30
2011-12-22 19:04:49 +05:30