Merge branch 'm22_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit5f48905520d597b3dd9dd3c681aed9d235ff364f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:57:53 +0000 (11 01:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:57:53 +0000 (11 01:57 +0200)
treef56ac22e3c3f9edb9f501b93631aca89c13762e9
parent86e2c5912851910e6fe0e58ccae72bec91cae35e
parentb8b00afaf38728330b4b9658324d64b863640b7e
Merge branch 'm22_MDL-35208' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE