Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 06:45:34 +0000 (14:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 06:45:34 +0000 (14:45 +0800)
commit74c32f21e25d8af4e192b508997efe903d77f053
treed400092c047587ffb068f29a0fe5310e2f89eb1a
parentfb00b083cebe218d24b6c6cde018b41670fe070f
parentb146b6a8c3e8e99b7e6fa3373c0bb4efc0db338d
Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle