Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:13:51 +0000 (00:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:13:51 +0000 (00:13 +0100)
commit044566f0016dd3984da270cb0ae178886cdea9ac
treee5f3c9ee035da8b6b13419335e50f95a9b9c7b23
parent87b6981e25689981bc22c648fdb8c4bd4973efac
parent6f07bf766b2b314b8f1b1b5fccf8ea7ec3f9efaf
Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle