Merge branch 'wip-mdl-35047-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_...
commit1bffd70569976f45424b42fadf7931a130992596
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 21:57:31 +0000 (8 23:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 21:57:31 +0000 (8 23:57 +0200)
tree8af0f8f1dde0caa07db929248e97e1b67b3333cf
parentd60c0e9650e6059a96c470cd01f40d2f51a0e587
parentb5f0654fd21df732b1273994f84509e80e674e40
Merge branch 'wip-mdl-35047-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE