Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:43:52 +0000 (10:43 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:43:52 +0000 (10:43 +0100)
commit42da111dbeef45e42cc51629c6471a0744ac579e
treea7ebf1780abf6a0af6cd45dafd64e356806a3c4c
parentbb48e33fda8476a981580d3e42954e7327e795c2
parentb0001c15f213eb4eff537b4448bdfaececdcd9c5
Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle