Fix tab name in help message [fixes #112]
Pin test versions
Add S3-support for Travis to get test artifacts for failed tests
Fix Travis-artifacts install in Travis
Set AWS S3 bucket name for Travis artifacts
Move upgrades to separate package.
Pin versions in test-plone-4.x.cfg.

Without this, too new versions get added, which lets buildout quit with an error.
Move pins from travis.cfg to test-plone-4.x.cfg.

This hopefully makes the tests pass locally, due to getting a newer selenium version.
Back to development: 1.2.2
Fix translation views so that the correct from and to languages are shown
Add changelog entry for Fred's change.
Add upgrade step for new registry value.
Merge pull request #85 from deiferni/1.x

Add upgrade step for new configuration registry value
Pyflakes, PEP, plone.api-style imports ordering
Merge branch '1.x' into 106-shared-search

Conflicts:
	docs/HISTORY.txt
	setup.py
	src/plone/app/multilingual/catalog.py