Merge branch 'MDL-33681_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit897329c2473d330cc5809dacf23e6fe2ed70e331
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:06:41 +0000 (13 00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:06:41 +0000 (13 00:06 +0200)
treea8804274aaf72188e93f59c286a12fd6fe47f7f9
parent89c3d84eda723c78fa7c3636816e7fe5f4f4d70c
parent8ad93cebfa33c6ebfeeac6cce5ba972cf90fb367
Merge branch 'MDL-33681_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE