Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)
commit97436e311c05dd1bef7bb875b23a9d112f9475ae
treea6f330789b34b0c4494d105ffe1781d365b927de
parent90ce5afd8142aac28bafba4818cecd64b4083dbf
parentc9b94fb0d439c7eef349502a51c2dade18bf6c25
Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle