adding .openshift directory
adding .openshift directory
Merge branch 'openshift' of ssh://github.com/ghelleks/huginn into openshift

Conflicts:
	.openshift/action_hooks/post_deploy
	.openshift/action_hooks/post_start_ruby-1.9
use $OPENSHIFT_GEAR_DNS for DOMAIN
config files now using $OPENSHIFT_* env vars
Direct folks to the wiki for instructions
explicitly define asset manifest
Merge branch 'openshift' of ssh://github.com/ghelleks/huginn into openshift
Merge branch 'master' of ssh://github.com/cantino/huginn into openshift

Conflicts:
	config/database.yml
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
add ability to specify host and port for mysql
Merge branch 'master' of ssh://github.com/cantino/huginn into openshift

Conflicts:
	config/database.yml
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
Merge branch 'openshift' of ssh://github.com/ghelleks/huginn into openshift
Merge pull request #36 from ghelleks/mysql-tcp-fix

add ability to specify host and port for mysql
Merged pull request #36: restore mysql tcp/ip configuration

Conflicts:
	config/database.yml