Merge branch 'MDL27-48421' of https://github.com/timpricecatalyst/moodle into MOODLE_...
commitd1da63854080ac78b13b9c221e327f04dd4139c2
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 17:01:11 +0000 (22 17:01 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 17:01:11 +0000 (22 17:01 +0000)
treea23e5f9d73fa132f797c8c3f07658dfd86865ba1
parentf38da6c2e0b98602353275a0dce88e9bccd26f4f
parent297a18d3e91770b5c9abd4cfe7b68744e1de5da8
Merge branch 'MDL27-48421' of https://github.com/timpricecatalyst/moodle into MOODLE_27_STABLE