Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

diff --combined lib/default.php
index 26b872da4b82c0055d385e38d059eb20afa8146b,e41d5c6862a9e07acf2e19699dd512c3fc0f75ee..f524e194c4829142232bf49978e025a9cc6394e2
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -75,8 -75,7 +75,8 @@@ $default 
                'schemacheck' => 'runtime', // 'runtime' or 'script'
                'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
                'log_queries' => false, // true to log all DB queries
 -              'log_slow_queries' => 0), // if set, log queries taking over N seconds
 +              'log_slow_queries' => 0, // if set, log queries taking over N seconds
 +              'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
          'syslog' =>
          array('appname' => 'statusnet', # for syslog
                'priority' => 'debug', # XXX: currently ignored
@@@ -302,6 -301,7 +302,7 @@@
                                   'WikiHashtags' => null,
                                   'RSSCloud' => null,
                                   'ClientSideShorten' => null,
+                                  'StrictTransportSecurity' => null,
                                   'OpenID' => null),
                'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
                ),