fix tab
add token to quotaholder client
also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
Merge remote-tracking branch 'origin/0.12' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/activation_backends.py snf-astakos-app/astakos/im/api/admin.py snf-astakos-app/astakos/im/auth_backends.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
fix quotaholder imports
Fixes
Back up file
Merged demo
timeline charging hello world
enhance timeline form, traffic charging support
handle limit conditions in timeline charging
View revisions
Also available in: Atom