Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 23:51:14 +0000 (12:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 23:51:14 +0000 (12:51 +1300)
commit8134eb8573cd0428e8f6e2ef6643dbb1bf613151
treecb68b44b93662d968eb44354733eb86ea463092b
parentb5196badcd6ab59de84d402b3238dc05ed87f3ed
parentebb8de5d379445671ee33e9c2ef9f782d99e267d
Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle