Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 09:01:15 +0000 (17:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 09:01:15 +0000 (17:01 +0800)
commitfc8f8e6e5aa1b51e77d3b891b2fa2f4814a53858
tree470f13589ed838698ae3bf963b434885bffa90e0
parentb40fc76b97cc8eeebf43ad5dfc342e0a54375291
parent0bb431e3ac7ea5173aa6318122c1a7cbeb24a44b
Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle