Merge branch 'MDL-32688-m22' of git://github.com/itamart/moodle into MOODLE_22_STABLE
commita6e1cc12c82ded32fd12cb14eaf1d82fe2fd622a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:54:00 +0000 (18 01:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:54:00 +0000 (18 01:54 +0200)
tree438288246b64069983d786fe9706740b6fd1ebe8
parent3b4f791ba0f07f822983989194e57df66ec4225c
parent4818668672645ddcc6555e0e6cb1edd0ea388ead
Merge branch 'MDL-32688-m22' of git://github.com/itamart/moodle into MOODLE_22_STABLE