Merge branch 'MDL-46498_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE
commitbf4dcc4518f2beab5d67f3ff8127b3d75b6fe286
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jan 2015 17:48:41 +0000 (5 17:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jan 2015 17:48:41 +0000 (5 17:48 +0000)
tree5a1aa3390f8293374b43d743a4883d5309661c5e
parentd569c472198cc30f9f1e3bf3b0ece2234ab662db
parent7eeca30cef9b4ff2dafe4111b2f0025fe945a147
Merge branch 'MDL-46498_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE