Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)
commit6d84f28553f118c2064a748194650f37e01f7128
tree70a727933dc9fc8a3c8cf5a3a210b21c72152cfd
parent74cb9073d0eb7eb346f8e783fd104eda4be2a45c
parent8bca3609eec26e261d46b1e37d625511cecf3036
Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle