Merge branch 'develop' into storage_transactions

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

1 files changed, 2 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index f01eec436f..59ac4fbf94 100644..100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright 2014 matrix.org
 #
 # Licensed under the Apache License, Version 2.0 (the "License");