Correctly add map namespace when $phpName has no backslash (e.g. namespaces are not used) - fixes #614
Merge branch 'master' of git://github.com/ciromattia/Propel into ciromattia-master
add test for issue #622
[Sluggable] add test to prove issue with slug ending with 0XYZ
{Sluggable] fix issue with slug ending with 0XYZ
Merge pull request #632 from jaugustin/fix-sluggable-exception

Sluggable fix an exception with slug endding with 0XXX
Bugfix for join equality when default join type is used

$j1 = new Join('foo', 'bar');
$j2 = new Join('foo', 'bar', 'INNER JOIN');
$this->assertTrue($j1->equals($j2));
Merge pull request #638 from arvenil/fix-join-equality

Bugfix for join equality when default join type is used
Fixes JOIN duplication issue when default join type equals given join type (issue #373)
Merge pull request #641 from arvenil/fix-issue-373-join-duplication

Fixes JOIN duplication issue when default join type equals given one (issue #373)
Fix CS
Prepare 1.6.9 release
Merge branch '1.6'

Conflicts:
	CHANGELOG
	generator/default.properties
	runtime/lib/Propel.php
Revert bad CS fix (alternative CS behavior)
Merge pull request #629 from jaugustin/ciromattia-master

DatabaseMap::getTableByPhpName($phpName) with no namespaces #622 + test
Update .travis.yml
add one-to-one handling to VersionableBehavior
Merge pull request #647 from havvg/feature/versionable-one-to-one

add one-to-one handling to VersionableBehavior
Merge branch 'master' into ormigo

* master:
  add one-to-one handling to VersionableBehavior
  Update .travis.yml
  Revert bad CS fix (alternative CS behavior)
  Prepare 1.6.9 release
  Fix CS
  Fixes JOIN duplication issue when default join type equals given join type (issue #373)
  Bugfix for join equality when default join type is used
  {Sluggable] fix issue with slug ending with 0XYZ
  [Sluggable] add test to prove issue with slug ending with 0XYZ
  add test for issue #622
  Correctly add map namespace when $phpName has no backslash (e.g. namespaces are not used) - fixes #614

Conflicts:
	generator/lib/behavior/versionable/VersionableBehaviorObjectBuilderModifier.php