modified:   deb/usr/bin/mkfstab.py
Merge branch 'master' of https://github.com/atilaromero/mountfstab

Conflicts:
	deb/DEBIAN/control

	modified:   deb/DEBIAN/control
	modified:   deb/usr/bin/mkfstab.py