Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)
commit57902e2738a917778ed7a17a6030675c46a5b202
treeec13fa6e74f6133c44913327db02c2c1904ae440
parentc9f8620492ebc0c823f52291c079cd57803a83ae
parentba097b82535538142c94a93fa38e4e92ef4be17f
Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle