Merge branch 'MDL-47392-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:12:01 +0000 (11:12 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:12:01 +0000 (11:12 +0100)
commit7829a6d1cac6b3df5a97c273ba7abd119a0730ac
treeb0dbf02db9b096f457b7dfd568ae17e82906b43a
parent50c4e8e8b60d013c3301802146a971b29042787d
parent044a298e6f5c7919160a629c2763600a055e8269
Merge branch 'MDL-47392-master' of git://github.com/xow/moodle