Merge branch 'master' into django-1.8

This commit is contained in:
Alex Seeholzer 2015-06-12 15:51:45 +02:00
commit 4f8fb983a8

Diff Content Not Available