Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'edge' of github.com:webnotes/erpnext into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
Merge branch 'edge' of github.com:webnotes/erpnext into edge
aii fixes
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
aii: fixes in stock reconciliation
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
[aii] [patches] minor fixes
Merge branch 'aii_release' into edge
Merge branch 'master' into edge
Merge branch 'master' into edge
[merge]
Merge branch 'master' into edge

Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
	patches/patch_list.py
Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/march_2013/p07_update_valuation_rate.py