Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 02:57:59 +0000 (15:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 02:57:59 +0000 (15:57 +1300)
commitd148da7e56f43e1f5496b0d587b913127a64d4a0
treed85b3512649cf18a53c46a1a7acd72863a961fd0
parentb52e55bb47a21fbb68fe400ce03273d895dcc45d
parent338ee3d6bbd75ce58fa1810bf344dc80b9abe97c
Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle