git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5556 7b40dde9-fc51-43d4-b609-63a66f0a0cee
UPGRADE 3.1


git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5557 7b40dde9-fc51-43d4-b609-63a66f0a0cee
3.1 CLEANUP

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5559 7b40dde9-fc51-43d4-b609-63a66f0a0cee
README.md cleanup

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5561 7b40dde9-fc51-43d4-b609-63a66f0a0cee
README.md cleanup

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5564 7b40dde9-fc51-43d4-b609-63a66f0a0cee
adding .travis.yml file


git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5565 7b40dde9-fc51-43d4-b609-63a66f0a0cee
git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5566 7b40dde9-fc51-43d4-b609-63a66f0a0cee
UPDATING .travis.yml file

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5567 7b40dde9-fc51-43d4-b609-63a66f0a0cee
BUGFIX

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5570 7b40dde9-fc51-43d4-b609-63a66f0a0cee
TYPO fix in searchplus

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5624 7b40dde9-fc51-43d4-b609-63a66f0a0cee
Merge branch 'master' of https://github.com/sunnysideup/silverstripe-searchplus

# By nicolaas
# Via nicolaas
* 'master' of https://github.com/sunnysideup/silverstripe-searchplus:
  TYPO fix in searchplus
  BUGFIX
  UPDATING .travis.yml file
  git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5566 7b40dde9-fc51-43d4-b609-63a66f0a0cee
  adding .travis.yml file
  README.md cleanup
  README.md cleanup
  3.1 CLEANUP
  UPGRADE 3.1
  git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/searchplus/trunk@5556 7b40dde9-fc51-43d4-b609-63a66f0a0cee

Conflicts:
	code/SearchPlusPage.php