Merge branch 'm22_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit31970a66a85f44d999beb294a64739879fce22f5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:23:45 +0000 (27 18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:23:45 +0000 (27 18:23 +0200)
tree44992f4f346c1dcf155592eb4a9c3a17a3508f6b
parente5783fd132e9147aacefcfa6a3feee5bba1ea4f3
parentb33d969d9106d1172febcb5b0a46fb62107fdede
Merge branch 'm22_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE