bootstrapped language and added 'hi'
commified item_code query
appraisal template, total must be 100
Merge branch 'master' of github.com:webnotes/erpnext into edge
Merge branch 'master' of github.com:webnotes/erpnext
Merge branch 'master' of github.com:webnotes/erpnext
fix in syntax when using erpnext.queries.item
fix in stock entry.py -- dictionary size should not change when looping
fix in leave application holiday calculation
fix in holiday list
patch to fix existing holiday lists
patch to fix existing holiday lists
Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/january_2013/holiday_list_patch.py
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco