Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)
commit45f2e27c4dd0809e0aee79bd3899a8882ea1115b
treee55c5a89d1358044777704937a3336310d50954c
parent668980be3e2cf4da61e28a8bc3e33c8dcc94cd35
parent12f946d99904cf2dda79306b5d2d7380712e18ba
Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle