[Trusty] version bump 'www-client/firefox'
Merge branch 'master' of https://github.com/shiznix/unity-gentoo

Conflicts:
	www-client/firefox/Manifest