setup.py | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 remove bottle.py from scripts

docs/cli.rst | 46 46 + 0 - 0 !
docs/conf.py | 6 6 + 0 - 0 !
2 files changed, 52 insertions(+)

 add cli manpage

bottle.py | 48 27 + 21 - 0 !
1 file changed, 27 insertions(+), 21 deletions(-)

---

bottle.py | 2 1 + 1 - 0 !
test/test_environ.py | 2 2 + 0 - 0 !
2 files changed, 3 insertions(+), 1 deletion(-)

 fix string type bug introduced with the cve-2016-9964 patch
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850176
Bug: https://github.com/bottlepy/bottle/issues/923