1
1
customer
cfd_ok
tiny_edit
tiny_edit
finance_ui
Merge branch 'xiaoyu'

Conflicts:
	dblib.xls
Delete 20141110193855_delete_lower_id_from_customer.rb
Merge pull request #8 from satzcoal/master

merge1113