Merge branch 'master' into debian
[snf-cloudcms] / cloudcmsfaq / __init__.py