Commit 7dea4d43 authored by Son Nguyen's avatar Son Nguyen

Merge branch 'master' of git://gitorious.org/mahara/mahara-scripts

Conflicts:
	mahara-langpacks/langpacks.pl
parents f70c7299 0782129d
Markdown is supported
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