Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:23:38 +0000 (20:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:23:38 +0000 (20:23 +0200)
commitd06700cbd6fdbaad3b3b90c1de1ace6a4b497243
treeb3f70243f603edeccfc70ef29bae4ae152754794
parentf7f8ca2420e1de284674ea1fd73c605df3113d1b
parentbd197963efb6e27f105baa37c2461f5b5333d698
Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle