Merge branch 'master' into slaprunner

CHANGES.txt

-0.14 (2011-12-30)
+0.15 (2012-01-09)
 =================
 
  * No change yet
 
+0.14 (2012-01-09)
+=================
+
+ * onetimeupload: SSL should be provided by an http frontend [Romain Courteaud]
+
 0.13 (2011-12-30)
 =================
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.14-dev'
+version = '0.15-dev'
 name = 'slapos.toolbox'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/onetimeupload/__init__.py

@@ -104,7 +104,7 @@ def run(config):
       template = app.open_resource('templates/index.html')
       return template.read()
 
-  app.run(host=config.host, port=config.port, ssl_context='adhoc')
+  app.run(host=config.host, port=config.port)
 
 def main():
   "Run default configuration."