Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle
commitd9fb78c9810311c32ff26d76969365d850207c15
authorMarina Glancy <marina@moodle.com>
Mon, 3 Nov 2014 09:03:57 +0000 (3 17:03 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 3 Nov 2014 09:03:57 +0000 (3 17:03 +0800)
treedda99623e9b360c9ca1ad7a06551b1e67579fe95
parentb7f75a9c05c65fb1d2f6391f5dd852f9e923a183
parent54957bdbf75af597a9025267c81fe913d3a2bd56
Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle