Automatic commit by dev build.
Automatic commit by dev build.
merge...

Merge branch 'master' of github.com:ThumbWhere/ThumbWhere-Drupal7-Module-Releases

Conflicts:
	release-history/thumbwhere/7.x/manifest.xml