Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Thu, 21 May 2015 16:03:48 +0000 (00:03 +0800)
committerAMOS bot <amos@moodle.org>
Thu, 21 May 2015 16:03:48 +0000 (00:03 +0800)
commitb8347ccafa71d1561fc102a5780a8fbf952518b6
tree3ac1243e53535df7bf0c5afdd8e2c438bbf61ebd
parent21b2b8c485e1e12e90207f50cde605ad23f0ead1
parent803f565753bd9fe41acc802774adac75c2219880
Merge branch 'master' into install_master