Add .ico to the list of secure file extensions
Add fr_FR translation
fixes so any usage of get_permalink gets HTTPS or HTTP based on the page id supplied (before it would set it to HTTP if the page were supposed ot be HTTPS"
Fixed an issue where hundreds of Warning are displayed while define('WP_DEBUG', true); is present; more details: "first argument of wpdb::prepare should have a placeholder".

A checked was performed to find all files containing $wpdb->prepare, using
- grep -ri 'wpdb->prepare' *

And the result showed:
- plugins/wordpress-https/lib/WordPressHTTPS.php:
- $multisite_hosts = $wpdb->get_col($wpdb->prepare("SELECT domain FROM " . $wpdb->blogs, NULL));

- plugins/wordpress-https/lib/WordPressHTTPS.php:
- $blogs = $wpdb->get_col($wpdb->prepare("SELECT blog_id FROM " . $wpdb->blogs, NULL));

- plugins/wordpress-https/uninstall.php:
- $blogs = $wpdb->get_col($wpdb->prepare("SELECT blog_id FROM " . $wpdb->blogs, NULL));

Replaced 3 instances of where $wpdb->prepare() second argument was passed as null and possibly opens up a vulnerability.

Summary of the change:
- Orignial: $wpdb->get_col($wpdb->prepare("SELECT domain FROM " . $wpdb->blogs, NULL));
- New:      $wpdb->get_col($wpdb->prepare("SELECT domain FROM %d", $wpdb->blogs));

For information see the ticket that introduced the notice in WP3.9 https://core.trac.wordpress.org/ticket/25604
Merge pull request #28 from chaosdorf/master

Add .ico to the list of secure file extensions
Merge pull request #29 from AntoineVe/master

Add fr_FR translation
Merge pull request #31 from mnelson4/master

fixes so any usage of get_permalink gets HTTPS or HTTP based on the page...
Merge pull request #32 from Steven-Oddineer/master

[security] Fixed a issue where hundreds of Warning "first argument of wpdb::prepare should have a placeholder" are displayed while define('WP_DEBUG', true);
Merge branch 'master-upstream'

Conflicts:
	lib/WordPressHTTPS.php
Whitespace changes.
Refreshing my changes in order to merge properly.