Merge pull request #1444 from eddmann/bug/database-connector

Fixed connector options merge bug.

laravel/database/connectors/connector.php

@@ -35,7 +35,7 @@ abstract class Connector {
 	{
 		$options = (isset($config['options'])) ? $config['options'] : array();
 
-		return $this->options + $options;
+		return $options + $this->options;
 	}
 
 }