Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)
commitf9075a788842c547e94162fb04bf0afd2186c4da
treec991feb0b91e13e6fbb17ba6c2d6f0146b2ac2fc
parent584539c0fc26447c5b7dab89eecc37950ed75321
parent0f5e439e4b6a05aae7585578f9fc32d269bf89a0
Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle