Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 1 Nov 2013 02:04:29 +0000 (13:04 +1100)
committerMarina Glancy <marina@moodle.com>
Fri, 1 Nov 2013 02:04:29 +0000 (13:04 +1100)
commit1637827d75aa7731343530e1a78e6755fe521ae0
tree7d6ed8c8832a9b3caa804f3e7e93e9d925d59ed6
parent35e903971bcc2c0ae8125f258b7e8474e21c9283
parentaa13929988d7626843ed4478bb3f0509d21ad5d6
Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle

Conflicts:
lib/classes/event/user_deleted.php
lib/classes/event/user_deleted.php