Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)
commit5990febb0c0c0eac2d8c339069c8a990f1e13834
tree6e7915c175bbeed175e2d55012177b78b958f65e
parentf736c1b3940d46c1acea9cccdbd5e34ff18d2ae2
parentdc4bff329dc2faf56445effebaa6790e0bc76713
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle