Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:05:27 +0000 (02:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:05:27 +0000 (02:05 +0100)
commit06d78e820981f5e3754d4996cc000de1411fb47a
tree93f03fec53585153b30be13ef3fa8bed9736b96d
parentbecb4de7074ec60d606fe8cfa5c033a574074419
parent88be30c28c3e2ea540f2c34ec64b5ed5a8304ad3
Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle