Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit1c37f8865d7a9312eab2480b913049f3bf345114
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:10:43 +0000 (28 20:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:10:43 +0000 (28 20:10 +0200)
tree0541dfbf79b22a2eebd9be54c45e74f62fe1d70c
parent56d47558ff3c0b43cdddfba498c773a0d4ccc039
parent9345e7bfb8aabd41af98874dd02985d6655b59b0
Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE