Commit 242a0ac2 authored by Son Nguyen's avatar Son Nguyen

Merge branch 'master' of ssh://reviews.mahara.org:29418/mahara-scripts

Conflicts:
	debian/changelog

Change-Id: I12b6d0c57f62d0e5e609e004b60cf4c58199fa6a
parents 5b47b28e 86c95263
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