Capability to set memory limit for uwsgi
Merge branch 'master' of github.com:creckx/pcp

Conflicts:
	wsgiadmin/locale/cs/LC_MESSAGES/django.po
Resolve conflict with locale