git on bzr
debian_fp deleted
time corrected
Merge branch 'master' of https://github.com/necktwi/ferryport.git

Conflicts:
	.gitignore
	Makefile
	MediaManager.cpp
	debian/changelog
	debian/rules
	ferryport.ffjson
	ffmpeg_install.sh
	main.cpp
	nbproject/Makefile-Debug.mk
	nbproject/configurations.xml
	nbproject/private/configurations.xml
	nbproject/private/private.xml
	nbproject/project.xml