Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:43:19 +0000 (00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:43:19 +0000 (00:43 +0100)
commit64a807ae44d9da315eed9fd1b0061bcd30d616df
tree047cfa81a57b91aae3bc8fa62c37832fea6748e8
parentcf140de9459a3f98496129aab331f6f06e0aa456
parent970c5f3849f3b84fcecff0736bcfa0ffecd62fda
Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle