Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:08:11 +0000 (13:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:08:11 +0000 (13:08 +0800)
commit8c497d8d9f0bbe52dc06944ded201f5c8bfbfb1b
treea3887c27f4cd844edb3e3fca4385ca9c057f0339
parentb9432e1a7d1b815c5b3e362dd5ab3d81e8feb7cb
parentc5639c9118cbc27a2a97afb5e1ab22513f053196
Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle