Merge branch 'MDL-54055-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE
commitc3bac7250a646255a763fbc5cba20fc953be0852
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 07:02:09 +0000 (11 15:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 07:02:09 +0000 (11 15:02 +0800)
tree5f1b26e8b121d7cad6a1357d00c235d91a781925
parentcb19237594ad44d88de56a45913d45884734887a
parent6cb33703ba7376109e5363445f95ab162eb3ff5f
Merge branch 'MDL-54055-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE