~
~
Merge branch 'master' of 192.168.1.113:/home/git/pyprojects/py

Conflicts:
	cnki.py
~
Merge branch 'master' of niwho.gicp.net:~/pyprojects/py
~
net disk
Merge branch 'master' of 192.168.1.113:/home/git/pyprojects/py
metadata
~
Merge branch 'master' of github.com:niwho/nwpypy

Conflicts:
	mydropbox.py