Merge branch 'MDL-33653' of git://github.com/timhunt/moodle
commit454db7d467fa9c2f9ccc8340ebbf086dae1d23c3
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 09:06:14 +0000 (11 17:06 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:31:52 +0000 (13 18:31 +0100)
tree9b9771f3a44948354274fdbbdb1bcbab511b740f
parentc6b7551c71084b498c6883420dcff7bf094873ee
parent8011be189e4dc081c4dc6863f02a1507b1cf904b
Merge branch 'MDL-33653' of git://github.com/timhunt/moodle