Merge branch 'develop' into request_logging

Conflicts:
	synapse/config/logger.py
This commit is contained in:
Mark Haines 2014-10-30 11:13:58 +00:00
commit 7c06399512
46 changed files with 391 additions and 199 deletions

View file

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.