Merge branch 'MDL-47712-int-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Mar 2015 05:50:11 +0000 (13:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Mar 2015 05:50:11 +0000 (13:50 +0800)

Trivial merge