Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 May 2014 06:49:58 +0000 (07:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 May 2014 06:49:58 +0000 (07:49 +0100)
commita64528d88cd873fc746d1f555a5ce73aa18bc62f
tree744be6b57bce177c61bfd2e4e316be9c4c2f7c1d
parent1ce76b900ba58c3ad3318eaa20ea1df1f63f60ee
parentb0ad512f9531cb94c647002e60a4deaaf5c10303
Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle