sd
Merge branch 'master' of github.com:hbnn/Python_PYQT

Conflicts:
	My_module/My_1st.e4p
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t
	My_module/phonelog-fk.pyw
Merge remote-tracking branch 'origin/master'

Conflicts:
	My_module/My_1st.e4p
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t