Merge remote-tracking branch 'origin/5_6_yosemite' into 7_0_yosemite

* origin/5_6_yosemite:
  use our compiled ssl for imap

lib/Package/imapcclient.pm

@@ -67,7 +67,7 @@ sub php_extension_configure_flags {
 	my $self = shift @_;
 	my (%args) = @_;
 	my $packagename = $self->packagename();
-	return "--with-imap=shared,../$packagename --with-kerberos=/usr --with-imap-ssl=/usr";
+	return "--with-imap=shared,../$packagename --with-kerberos=/usr --with-imap-ssl=/usr/local/php5";
 }