Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 20:46:49 +0000 (08:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 20:46:49 +0000 (08:46 +1200)
commit964b220c83fd607fbf996b6f1b1a08721273d79d
tree3b877482b2776fa9e5362da64b3e57303b71fd87
parent72655d053990ceff96dcbb84e396dd96543355c7
parenta275c52f62a9461be2e0a1eb4413569c71c77c4e
Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle