Merge branch 'devel'
[qcg-portal.git] / templatetags / __init__.py