Merge branch 'MDL-52507_30' of https://github.com/jinhofer/moodle into MOODLE_30_STABLE
commite8047b8876a5a9b602572f912de7543bfa19c906
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:08:01 +0000 (13 09:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:08:01 +0000 (13 09:08 +0800)
tree151e7cd5da504a0314c3b4121212aafb9c3ef129
parentce9eec227be2d62e2d2cac6ec9c96c89e0fddef4
parent1e9de38a7424d0fe8fd34c22c75047fa389d9961
Merge branch 'MDL-52507_30' of https://github.com/jinhofer/moodle into MOODLE_30_STABLE