Commit fa9e428f authored by Evan Goldenberg's avatar Evan Goldenberg
Browse files

Merge branch 'stats' of git@gitorious.org:mahara/mahara into stats



Conflicts:
	htdocs/lang/en.utf8/admin.php
	htdocs/lib/registration.php
	htdocs/theme/raw/templates/admin/stats.tpl
Signed-off-by: default avatarEvan Goldenberg <evang@catalyst.net.nz>
parents 0020a52d 1ff0a019
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment