Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2015 10:28:24 +0000 (12:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:26 +0000 (11:06 +0200)
commit299469d08cdddefb46bfcabdf258b2b4339483f6
tree30329257df304a16d1793294eb02589d465549c5
parent1d3e954630ee738313ed40587799c57044910120
parentea2f0e3e87aa6f6a060295ef10dbef19f5904cef
Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle