Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)
commit0809a0ea02176cc016e9dd834df8bd8e1589c210
tree04e5a7d1824d5e3c490eb3c72644e5da06bfbf30
parentf758ad33e42e2d63282c3d7a36f6dfdd33e18e41
parentee72a4dbf3eb454032b21777ad84cd3b58ce8984
Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle