combine filters
Merge branch 'master' of github.com:abetkin/django-qfilter