Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)
commitbfceabab5d4b155fbe1722e1cf4496bbb0162937
treefb1c245c7954508a58814f6773df704befc91d13
parentfee0ba1f4ec2360d9d25fb2a344d54f09624334c
parent263fb9d1bc1a5f074da54d5d027896e0a2983244
Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle