essage=测试提交与 merge
Merge remote-tracking branch 'osbzr/master'

Conflicts:
	bzr_fi_gl/__init__.py
Merge branch 'master' of git://github.com/osbzr/bzrerp

Conflicts:
	bzr_base/__init__.py
Merge pull request #1 from osbzr/master

同步 osbzr/bzrerp master
Merge pull request #2 from osbzr/master

Merge
Merge pull request #3 from osbzr/master

Merge
Update bzr_fi_gl/__init__.py
Merge https://github.com/osbzr/bzrerp into osbzr-master

Conflicts:
	bzr_fi_gl/__init__.py
Merge branch 'master' of https://github.com/osbzr/bzrerp

Conflicts:
	bzr_fi_gl/__init__.py
bzr hr
模块更名
Merge pull request #13 from mrshelly/master

hr起步