Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 01:34:37 +0000 (09:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 01:34:37 +0000 (09:34 +0800)
commit647681d4e9263be57f6672cbee11696d4dedda78
treea82c7d820367be272f23e42dd3764c268cf9dc36
parentb38b62f86cf9608f2fcb524b1440220079aa151d
parent31635bfb63f64739cdce66c9c08227af82e78043
Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle