Merge branch 'MDL-51837-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 11:33:00 +0000 (11:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 11:33:00 +0000 (11:33 +0000)
commit2f3e84c13230881a6f69b56062b386d149789f4a
treea41524405a345dcbcfd5b009168c4798578e4032
parentf46aa6bc42d848fc23d3f369b05ce780c7e6df9c
parentb47454f6b75f024a48f3533ae401b28c2b8f6001
Merge branch 'MDL-51837-master' of git://github.com/junpataleta/moodle