continuous
Merge branch 'master' of https://github.com/gr4viton/pyInventory

Conflicts:
	2014_09_12 - pinmux/__pycache__/xmlPars.cpython-34.pyc
	2014_09_12 - pinmux/xmlPars.py~