Merge branch 'MDL-48491-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE
commit358c48ff276798b55aa2a43e56e52ca04d98d72b
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Jan 2015 02:58:32 +0000 (27 10:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Jan 2015 02:58:32 +0000 (27 10:58 +0800)
treeb250477f30d89c94a4ec13da32522d6271e29b00
parentd55e5bb821e0cacb7f14e320dfb2cfb8a70f8ac8
parentb44e802eaf5b1796c4f3005f1e6eab731f40f499
Merge branch 'MDL-48491-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE